任务流程优化

blade-service/blade-business/src/main/java/org/springblade/business/controller/FixedFlowController.java

@@ -411,7 +411,12 @@ public class FixedFlowController extends BladeController {
                 for (String userId : userIds) {
                     List<SignPfxFile> userPfxList = collect.get(userId);
                     if (userPfxList == null || userPfxList.isEmpty()) {
-                        notCertificateUserInfoSet.add(userId);
+                        String[] split = userId.split(",");
+                        for (String s : split) {
+                            if (StringUtils.isNumeric( s)) {
+                                notCertificateUserInfoSet.add(s);
+                            }
+                        }
                     }
                 }
                 if (!notCertificateUserInfoSet.isEmpty()) {
@@ -551,7 +556,7 @@ public class FixedFlowController extends BladeController {
             resultMap.setSize(fixedFlowsPage.getSize());
             resultMap.setTotal(fixedFlowsPage.getTotal());
             resultMap.setRecords(fixedFlowVOList);
-            fixedFlowVOList.sort(Comparator.comparing(FixedFlowVO::getSort));
+            fixedFlowVOList.sort(Comparator.comparing(item -> item.getSort() == null ? 0 : item.getSort()));
             Map<Boolean, List<FixedFlowVO>> groupMap = fixedFlowVOList.stream().collect(Collectors.groupingBy(record -> record.getFixedFlowName() != null && record.getFixedFlowName().contains("_") && record.getSort() == null));
             List<FixedFlowVO> copyFixedFlowVOS = groupMap.get(true);
             List<FixedFlowVO> fixedFlowVOS = groupMap.get(false);