yingzi 2 роки тому
батько
коміт
36aeed015f

+ 2 - 0
app/api/controller/User.php

@@ -60,6 +60,8 @@ class User extends BaseController
         $data['sex']               = $request->user['sex'];
         $data['type']              = $request->user['type'];//用户类型
         $data['type_name']         = "";//用户类型名称
+        $data['work_type_id']      = $request->user['work_type_id'];//用户职称类型
+        $data['work_type_title']   = $request->user['work_type_title'];//用户职称类型名称
         
         $data['info_audit_status'] = empty($infoAuditData)?-2:$infoAuditData["status"];
         $data['user_audit_status'] = empty($userAuditData)?-2:$userAuditData["status"];

+ 2 - 2
app/api/middleware/UserMiddleware.php

@@ -39,8 +39,8 @@ class UserMiddleware implements MiddlewareInterface
         try{
             $memData = (new UserModel)
                 ->alias("u")
-                ->field("u.*,wt.title as user_work_type_title")
-                ->join("user_work_type_id wt","wt.id = u.user_work_type_id","left")
+                ->field("u.*,wt.title as work_type_title")
+                ->join("user_work_type wt","wt.id = u.work_type_id","left")
                 ->where('u.token',$token)
                 ->find();
             if(empty($memData)) {

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

@@ -207,8 +207,8 @@ class Audit extends BaseController
                     'admin_mono'        => $post['mono'],
                     'admin_time'        => time(),
                     'admin_id'          => $request->adminInfo['id'],
-                    'user_work_type_id' => $certData["user_work_type_id"]
                 ]);
+            (new UserModel)->where("uid",$certData["uid"])->update(["work_type_id"=>$certData["user_work_type_id"]]);
             return app('json')->success('操作成功');
         }
         //审核驳回