|
|
@@ -271,12 +271,11 @@ class User extends BaseModel
|
|
|
$totalCount = $this->alias("u")->where($where)->count();
|
|
|
$data = null;
|
|
|
if ($totalCount > 0) {
|
|
|
- var_dump($where);die();
|
|
|
$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 and ut.show_template_id = 7")//默认模板
|
|
|
+ ->leftJoin("user_show_template ut", "ut.uid = u.uid and ut.is_default = 1")//默认模板
|
|
|
->where($where)
|
|
|
->order("u.show_temp_seq", "desc")
|
|
|
->order("u.uid", "desc")
|
|
|
@@ -361,7 +360,7 @@ class User extends BaseModel
|
|
|
->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);
|
|
|
if (!empty($post["service_area"]) && is_array($post["service_area"])) {
|
|
|
$dataModel->where(function ($query) use ($post, $cityModel) {
|
