|
|
@@ -271,13 +271,12 @@ class User extends BaseModel
|
|
|
$totalCount = $this->alias("u")->where($where)->count();
|
|
|
$data = null;
|
|
|
if ($totalCount > 0) {
|
|
|
- @file_put_contents('quanju.txt', json_encode($where). "-搜索条件2\r\n", 8);
|
|
|
|
|
|
$data = $this
|
|
|
->alias("u")
|
|
|
->field("u.uid,ut.show_template_id,a.ancestral_place,a.status as is_type_audit")
|
|
|
->leftJoin("info_audit a", "u.uid=a.uid")
|
|
|
- ->leftJoin("user_show_template ut", "ut.uid = u.uid and ut.is_default = 1")//默认模板
|
|
|
+ ->leftJoin("user_show_template ut", "ut.uid = u.uid and ut.is_default = 1 and ut.show_template_id=7")//默认模板
|
|
|
->where($where)
|
|
|
->order("u.show_temp_seq", "desc")
|
|
|
->order("u.uid", "desc")
|