Explorar el Código

对接任务列表查看bug修改

chenr hace 6 meses
padre
commit
120672d50d

+ 5 - 2
blade-service/blade-meter/src/main/java/org/springblade/meter/controller/APIController.java

@@ -92,8 +92,11 @@ public class APIController {
         }
         if (ObjectUtil.isNotEmpty(dto.getSelectedType())) {
             sqlString.append(" AND (");
-            if (dto.getSelectedType().equals(1)) { //待办页面
-                sqlString.append("status = 1");
+            if (dto.getSelectedType().equals(1)) {
+                sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status = ? AND u_task_parallel.task_user = ?)");
+                params.add(1);
+                params.add(SecureUtil.getUserId());//待办页面
+                sqlString.append("AND status = 1");
             } else if (dto.getSelectedType().equals(2)) { //已办页面
                 sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status in(2,3) AND u_task_parallel.task_user = ?)");
                 /*当前自己的任务必须是已审批、已废除 status = 2,3 ,才视为已办*/