mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-09-02 05:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进query类的value和column方法的缓存问题

Browse Source
This commit is contained in:
thinkphp
2016-04-21 18:04:57 +08:00
parent f39c6627da
commit faff79e2ac
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/Model.php
View File

@@ -605,7 +605,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$model = $class->$relation();
$info = $class->getRelationInfo();
$table = $info['model']::getTable();
return self::db()->alias('a')->join($table . ' b', 'a.' . $info['localKey'] . '=b.' . $info['foreignKey'])->group('b.' . $info['foreignKey'])
return self::db()->alias('a')
->join($table . ' b', 'a.' . $info['localKey'] . '=b.' . $info['foreignKey'])
->group('b.' . $info['foreignKey'])
->having('count(' . $id . ')' . $operator . $count);
}
@@ -630,7 +632,10 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
}
}
}
return self::db()->alias('a')->field('a.*')->join($table . ' b', 'a.' . $info['localKey'] . '=b.' . $info['foreignKey'])->where($where);
return self::db()->alias('a')
->field('a.*')
->join($table . ' b', 'a.' . $info['localKey'] . '=b.' . $info['foreignKey'])
->where($where);
}
/**