Min 1 年之前
父節點
當前提交
464ee27cfd

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

@@ -967,7 +967,7 @@ public class TaskController {
             queryWrapper.eq("task.group_id",groupId);
         }
         if(!StringUtils.isEmpty(targetUserId)){
-            queryWrapper.eq("task.creater_id",targetUserId);
+            queryWrapper.like("task.executorId",targetUserId);
         }
 //        else if (viewId == 3) {
 //            //今天的任务

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

@@ -552,7 +552,8 @@
             or (a.is_dept_audit = 1 and a.audit_dept_managerid = #{auditorId}))
         </if>
         <if test="auditUserId != null and auditUserId !=''">
-            AND FIND_IN_SET(auditUserId,a.executor_id)
+            AND ((a.is_dept_audit = 0 and a.project_auditor_id = #{auditUserId} and a.project_audit_state = 0)
+            or (a.is_dept_audit = 1 and a.audit_dept_managerid = #{auditUserId}))
         </if>
         <if test="isEngeering == 1">
             AND a.department_audit_state = 1