[修改] 流程页面权限

report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java

@@ -921,8 +921,11 @@ public class TodoTaskController {
         queryWrapper.orderByDesc("CREAT_TIME");
         queryWrapper.isNotNull("PRC_ID");
         queryWrapper.isNotNull("PRC_NUM");
-        queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue())
-                .or().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.STOP.getValue());
+        queryWrapper.and((wrapper)->{
+            wrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue())
+                    .or().
+                    eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.STOP.getValue());
+        });
 
         List<BusProcessName> list = iBusProcessNameService.list(queryWrapper);
         Page page = new Page();
@@ -1109,9 +1112,11 @@ public class TodoTaskController {
             if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) {
                 queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
             }
-
-            queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue())
-                    .or().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.STOP.getValue());
+            queryWrapper.and((wrapper)->{
+                wrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue())
+                        .or().
+                        eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.STOP.getValue());
+            });
 
             List<BusProcessName> list = iBusProcessNameService.list(queryWrapper);