Procházet zdrojové kódy

解决代填审核人错误问题

seyason před 8 měsíci
rodič
revize
db5867cf9d

+ 2 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectAuditorController.java

@@ -46,8 +46,8 @@ public class ProjectAuditorController {
     private TimeTypeMapper timeTypeMapper;
 
     @RequestMapping("/getList")
-    private HttpRespMsg getList(Integer projectId) {
-        String token = request.getHeader("TOKEN");
+    private HttpRespMsg getList(Integer projectId, String userId) {
+        String token = userId==null?request.getHeader("TOKEN"):userId;
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectById(token);
         Company company = companyMapper.selectById(user.getCompanyId());

+ 7 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -4967,10 +4967,13 @@
                 }
                 domainItem.projectAuditorId = null;
                 domainItem.projectAuditorName = null;
-
-                this.http.post('/project-auditor/getList',{ 
-                    projectId: domainItem.projectId,
-                },
+                var param = { projectId: domainItem.projectId};
+                if (this.isSubstitude) {
+                    if (this.workForm.userId != null && this.workForm.userId.length>0) {
+                        param.userId = this.workForm.userId[0];
+                    }
+                }
+                this.http.post('/project-auditor/getList',param,
                 res => {
                     if (res.code == "ok") {
                         domainItem.auditUserList = res.data;