任务流程

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/TaskClientImpl.java

@@ -272,6 +272,12 @@ public class TaskClientImpl implements TaskClient {
                             LinkedHashMap::new,
                             Collectors.toList()));
 
+            //获取当前任务中所有的流程，并且去重，如果该流程已经存在，那么则不允许编辑和删除
+            List<Long> ids = taskService.list(new LambdaQueryWrapper<Task>()
+                    .select(Task::getFixedFlowId)
+                    .eq(Task::getContractId, dto.getContractId())
+                    .isNotNull(Task::getFixedFlowId)
+                    .groupBy(Task::getFixedFlowId)).stream().map(l -> l.getFixedFlowId()).collect(Collectors.toList());
             List<Map<String, Object>> result = new LinkedList<>();
             for (FixedFlow fixedFlow : fixedFlows) {
                 Map<String, Object> map = new HashMap<>();
@@ -288,6 +294,7 @@ public class TaskClientImpl implements TaskClient {
                             .keySet();
 
                     map.put("id", fixedFlow.getId());
+                    map.put("isUse", ids.contains(fixedFlow.getId()) ? 1 : 0);
                     map.put("fixedFlowName", fixedFlow.getFixedFlowName());
                     map.put("linkUserJoinString", StringUtils.join(names, ","));
                 }

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MeterTreeContractServiceImpl.java

@@ -2423,6 +2423,11 @@ public class MeterTreeContractServiceImpl extends BaseServiceImpl<MeterTreeContr
             if (vo2List.size() == 0) {
                 throw new ServiceException("请勾选需要复制的节点后再保存");
             }
+            for (CopyMeterNodeVO2 vo2 : vo2List) {
+                if (StringUtils.isBlank(vo2.getNodeName())){
+                    throw new ServiceException("节点名称不能为空");
+                }
+            }
             //先转换为树
             //再把树转换为集合
             Long l5 = System.currentTimeMillis();