mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 20:52:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进join方法和alias方法的解析 改进软删除的base方法

Browse Source
This commit is contained in:
thinkphp
2016-10-06 19:48:11 +08:00
parent ebc015d620
commit 76b7f02ea4
7 changed files with 140 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/traits/model/SoftDelete.php
View File

@@ -133,10 +133,9 @@ trait SoftDelete
*/
protected function getDeleteTimeField($read = false)
{
if (isset($this->deleteTime)) {
$field = $this->deleteTime;
} else {
$field = 'delete_time';
$field = isset($this->deleteTime) ? $this->deleteTime : 'delete_time';
if (!strpos($field, '.')) {
$field = $this->db(false)->getTable() . '.' . $field;
}
if (!$read && strpos($field, '.')) {
list($alias, $field) = explode('.', $field);