内控bug

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/TaskProcessServiceImpl.java

@@ -88,9 +88,9 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                     break;
                 }
                 if (ObjectUtil.isNotEmpty(dto.getSelectStatus())) {
-                    queryWrapper.and(obj -> obj.apply("audit_user_ids_complete LIKE '%" + SecureUtil.getUserId() + "%' AND STATUS =" + dto.getSelectStatus()));
+                    queryWrapper.and(obj -> obj.apply("audit_user_ids_complete LIKE '%" + SecureUtil.getUserId() + "%' AND STATUS =" + dto.getSelectStatus() + ") OR (audit_user_ids LIKE '%" + SecureUtil.getUserId() + "%' AND STATUS =" + dto.getSelectStatus()));
                 } else {
-                    queryWrapper.and(obj -> obj.apply("audit_user_ids_complete LIKE '%" + SecureUtil.getUserId() + "%' AND STATUS IN(1,2,3)"));
+                    queryWrapper.and(obj -> obj.apply("audit_user_ids_complete LIKE '%" + SecureUtil.getUserId() + "%' AND STATUS IN(1,2,3)) OR (audit_user_ids LIKE '%" + SecureUtil.getUserId() + "%' AND STATUS = 3"));
                 }
                 break;
             case "3":  //我发起的任务
@@ -629,7 +629,10 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
         List<ProjectCostBudget> records = pages.getRecords();
         List<String> taskIds = records.stream().map(ProjectCostBudget::getId).map(String::valueOf).collect(Collectors.toList());
         List<String> deptIds = records.stream().map(ProjectCostBudget::getDeptId).filter(ObjectUtil::isNotEmpty).map(String::valueOf).collect(Collectors.toList());
-        List<DepartmentMonthPlan> departmentMonthPlans = jdbcTemplate.query("select * from c_department_month_plan where dept_id in(" + StringUtils.join(deptIds, ",") + ")", new BeanPropertyRowMapper<>(DepartmentMonthPlan.class));
+        List<DepartmentMonthPlan> departmentMonthPlans = new ArrayList<>();
+        if (deptIds.size() > 0) {
+            departmentMonthPlans = jdbcTemplate.query("select * from c_department_month_plan where dept_id in(" + StringUtils.join(deptIds, ",") + ")", new BeanPropertyRowMapper<>(DepartmentMonthPlan.class));
+        }
 
         //获取所有审批任务与计划任务关系
         Map<String, ExpenseTaskRecord> taskRecordMaps = new LinkedHashMap<>();
@@ -681,7 +684,7 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                 vo.setEndTime(planEndTime);
             }
 
-            if (ObjectUtil.isNotEmpty(obj.getDeptId()) && ObjectUtil.isNotEmpty(obj.getPlanStartTime()) && ObjectUtil.isNotEmpty(obj.getPlanEndTime())) {
+            if (departmentMonthPlans.size() > 0 && ObjectUtil.isNotEmpty(obj.getDeptId()) && ObjectUtil.isNotEmpty(obj.getPlanStartTime()) && ObjectUtil.isNotEmpty(obj.getPlanEndTime())) {
                 for (DepartmentMonthPlan departmentMonthPlan : departmentMonthPlans) {
                     SimpleDateFormat smp = new SimpleDateFormat("yyyy-MM");
                     ZoneId zoneId = ZoneId.systemDefault();