zhanglinxin 1 year ago
parent
commit
3dc756f703

+ 1 - 1
application/common/service/ApproveInfoService.php

@@ -258,7 +258,7 @@ class ApproveInfoService
             if ($info) {
                 if (!$user) {
                     // 审批申请人信息
-                    $approve_info_user = User::field('userid,name')->where('userid', 'in', $info['user_id'])->find();
+                    $approve_info_user = User::field('userid,name')->where('userid', $info['user_id'])->find();
                     $info['approve_info_user'] = $approve_info_user;
                 }
                 $department_data = Department::field('dept_id,name')->where('dept_id', 'in', $info['department'])->select();

+ 1 - 1
application/common/service/ApproveService.php

@@ -162,7 +162,7 @@ class ApproveService
             ->where('is_deleted', CommonConstant::IS_DELETED_0)
             ->with([
                 'approveInfo' => function ($query) {
-                    $query->field('is_deleted', true);
+                    $query->field('user_id,is_deleted', true);
                 }
             ])
             ->find($id);