|
|
@@ -269,7 +269,7 @@ class User extends BaseModel
|
|
|
if($totalCount>0){
|
|
|
$data = $this
|
|
|
->alias("u")
|
|
|
- ->field("u.uid,ut.show_template_id")
|
|
|
+ ->field("u.uid,ut.show_template_id,u.ancestral_place") // 添加查询字段 ancestral_place
|
|
|
->leftJoin("user_show_template ut", "ut.uid = u.uid and ut.is_default = 1")//默认模板
|
|
|
->where($where)
|
|
|
->order("u.show_temp_seq", "desc")
|
|
|
@@ -279,12 +279,6 @@ class User extends BaseModel
|
|
|
if(!empty($data)){
|
|
|
$data = $data->toArray();
|
|
|
}
|
|
|
- // 遍历列表数据，查询每个从业人员的用户信息，添加 is_type_audit 和 ancestral_place 字段
|
|
|
- foreach ($data as &$worker) {
|
|
|
- $user = User::where('uid', $worker['uid'])->first();
|
|
|
- $worker['is_type_audit'] = $user->is_type_audit;
|
|
|
- $worker['ancestral_place'] = $user->ancestral_place;
|
|
|
- }
|
|
|
$infoAuditDb = new InfoAudit();
|
|
|
foreach($data as $k=>$v){
|
|
|
$item=[
|
