|
@@ -269,12 +269,8 @@ class User extends BaseModel
|
|
|
if($totalCount>0){
|
|
if($totalCount>0){
|
|
|
$data = $this
|
|
$data = $this
|
|
|
->alias("u")
|
|
->alias("u")
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
->field("u.uid,ut.show_template_id,a.ancestral_place,a.status as is_type_audit")
|
|
->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("info_audit a","u.uid=a.uid")
|
|
|
-=======
|
|
|
|
|
- ->field("u.uid,ut.show_template_id")
|
|
|
|
|
->>>>>>> 7e9deec4b69946e56f2d67e274125611f70c3461
|
|
|
|
|
->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")//默认模板
|
|
|
->where($where)
|
|
->where($where)
|
|
|
->order("u.show_temp_seq", "desc")
|
|
->order("u.show_temp_seq", "desc")
|
