yingzi 2 years ago
parent
commit
0633edc49d
2 changed files with 7 additions and 32 deletions
  1. 6 2
      app/model/api/InfoAudit.php
  2. 1 30
      app/system/controller/Audit.php

+ 6 - 2
app/model/api/InfoAudit.php

@@ -35,10 +35,12 @@ class InfoAudit extends Model
         if(!empty($post["uid"])){
             $where[]=["au.uid","=",$post["uid"]];
         }
-        
+        //后台
+        $userField = $is_admin==1 ? ",u.mobile as user_mobile,u.nickname as user_nickname,u.avatar as user_avatar" : "";
         $data = (new InfoAudit)
                 ->alias("au")
-                ->field("au.*,wt.title as user_work_type_title,s.title as service_time_type_title")
+                ->field("au.*,wt.title as user_work_type_title,s.title as service_time_type_title{$userField}")
+                ->leftJoin("user u","u.uid = i.uid")//用户信息
                 ->leftJoin("user_work_type wt"   , "wt.id = au.user_work_type_id")//职称
                 ->leftJoin("service_time_type s" , "s.code = au.service_type")//服务时长类型
                 ->where($where)
@@ -77,6 +79,8 @@ class InfoAudit extends Model
             unset($data["service_price"]);
             unset($data["service_area"]);
             unset($data["service_project"]);
+        }else{
+            $data["admin_time"] = empty($data["admin_time"])?"":date("Y-m-d H:i:s",$data["admin_time"]);
         }
         return $data;
         

+ 1 - 30
app/system/controller/Audit.php

@@ -149,39 +149,10 @@ class Audit extends BaseController
         $post = UtilService::getMore([
             ['id', '', 'empty', '参数错误'],
         ], $request);
-        $data = (new InfoAudit)
-                ->alias("i")
-                ->field("i.*,u.mobile as user_mobile,u.nickname as user_nickname,u.avatar as user_avatar,s.title as service_time_type_title,w.title as user_work_type_title")
-                ->join("user as u","u.uid = i.uid","left")
-                ->leftJoin("service_time_type s", "s.code = t.service_type")
-                ->leftJoin("user_work_type w", "w.id = i.user_work_type_id")
-                ->where("i.id",$post["id"])
-                ->find();
+        $data = (new InfoAudit)->getItem($post,1);
         if(empty($data)){
             return app('json')->fail('数据不存在');
         }
-        $data = $data->toArray();
-        $serviceTypeModel = new ServiceTypeModel();
-        $data["birthday"]   = empty($data["birthday"])  ?"":date("Y-m-d",$data["birthday"]);
-        $data["admin_time"] = empty($data["admin_time"])?"":date("Y-m-d H:i:s",$data["admin_time"]);
-        $data["time"]   = date("Y-m-d H:i:s",$data["time"]);
-
-        $data["service_audit_imgs"] = getImageAr($data["service_audit_imgs"]);
-        $data["service_intro_imgs"] = getImageAr($data["service_intro_imgs"]);
-
-        //服务区域
-        $data["service_area"] = getImageAr($data["service_area"]);
-        $data["service_area_all"] = [];
-        foreach($data["service_area"] as $k2=>$v2){
-            $data["service_area_all"][]=getAreaItemAr($v2);
-        }
-        //服务内容
-        $data["service_project"]    = getImageAr($data["service_project"]);
-        $data["service_project_ar"] = [];
-        if(!empty($data["service_project"])){
-            $data["service_project_ar"] = $serviceTypeModel->where("id","in",$data["service_project"])->select();
-        }
-        $data["service_label"]     = getImageAr($data["service_label"]);
         return app('json')->success($data);
     }
     /**