瀏覽代碼

修复任务执行人被删除的问题

QuYueTing 1 月之前
父節點
當前提交
ba23807fdd

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

@@ -1049,7 +1049,6 @@ public class TaskController {
                     if(first.isPresent()){
                         e.setServiceName(first.get().getServiceName());
                         e.setServiceCode(first.get().getServiceCode());
-                        e.setId(first.get().getId());
                     }
                 }
             });
@@ -1060,7 +1059,6 @@ public class TaskController {
                     if(first.isPresent()){
                         e.setServiceName(first.get().getServiceName());
                         e.setServiceCode(first.get().getServiceCode());
-                        e.setId(first.get().getId());
                     }
                 }
             });

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -642,7 +642,7 @@
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,
         department.department_name as auditDeptName, a.is_dept_audit as isDeptAudit, a.project_audit_state as projectAuditState,task_group.name as groupName,a.group_id as groupId, a.custom_data as customData
         ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, a.overtime_hours as overtimeHours, a.custom_text as customText, dept_manager.name as deptAuditorName
-        ,a.group_audit_state as groupAuditState,a.batch_id as batchId,a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId,a.sap_service_id as sapServiceId, multi_degr_id as multiDegrId, extra_field4 as extraField4,extra_field5 as extraField5
+        ,a.group_audit_state as groupAuditState,a.batch_id as batchId,a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId,a.sap_service_id as sapServiceId, multi_degr_id as multiDegrId, a.extra_field4 as extraField4,a.extra_field5 as extraField5
         FROM report AS a
         left join user on user.id = a.creator_id
         JOIN project AS b ON a.project_id=b.id

+ 1 - 0
fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/config/RefererInterceptor.java

@@ -72,6 +72,7 @@ public class RefererInterceptor extends HandlerInterceptorAdapter {
                         }
                     }
                 }
+                LOGGER.warn("请求来源IP不在白名单中, refer host="+url.getHost());
                 return false;
             }
         }