Browse Source

Default Changelist

yingzi 1 year ago
parent
commit
bdb6125de3
2 changed files with 8 additions and 2 deletions
  1. 7 1
      app/api/controller/Pub.php
  2. 1 1
      app/model/api/User.php

+ 7 - 1
app/api/controller/Pub.php

@@ -219,7 +219,13 @@ class Pub extends BaseController
         $post["page"]     = $post["page"]<=0     ? 1  : (int)$post["page"];
         $post["status"]   = 1;
         $data = (new UserModel)->getApiWorkerList($post);
-
+        // 对返回的数据进行处理,添加 is_type_audit 和 ancestral_place 两个字段
+        foreach ($data['list'] as &$item) {
+            $infoAuditDb = new InfoAudit();
+            $infoData = $infoAuditDb->getItem(["status"=>1,"uid"=>$item["uid"]]);
+            $item['is_type_audit'] = !empty($infoData['is_type_audit']) ? $infoData['is_type_audit'] : 0;
+            $item['ancestral_place'] = !empty($infoData['ancestral_place']) ? $infoData['ancestral_place'] : '';
+        }
         return app('json')->success($data);
     }
     

+ 1 - 1
app/model/api/User.php

@@ -269,7 +269,7 @@ class User extends BaseModel
         if($totalCount>0){
             $data = $this
                 ->alias("u")
-                ->field("u.uid,ut.show_template_id,u.ancestral_place") // 添加查询字段 ancestral_place
+                ->field("u.uid,ut.show_template_id,u.is_type_audit,u.ancestral_place") // 添加查询字段 is_type_audit 和 ancestral_place
                 ->leftJoin("user_show_template ut", "ut.uid  = u.uid and ut.is_default = 1")//默认模板
                 ->where($where)
                 ->order("u.show_temp_seq", "desc")