diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java index 11ef56b7..81cf2498 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java @@ -118,7 +118,7 @@ public class ProcessEsChange implements Serializable { * 是否试行(0代表不试行,1代表试行) */ @ApiModelProperty(value = "是否试行(0代表不试行,1代表试行)") - private Integer tryFlag; + private String tryFlag; /** * 试行周期 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index d6ea8fc9..1fcf73f6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1089,7 +1089,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService { .collect(Collectors.joining(",")); stringObjectMap.put(FieldCommon.AUTH_DEPT, authDept); } - // 标准拆分标识 splitFlag(stringObjectMap); // 对返回的字段做处理 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java index a84aac0f..03b5f7a9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java @@ -12,7 +12,7 @@ import com.jero.modules.laws.standard.entity.LawsNodeRelation; import com.jero.modules.laws.standard.entity.LawsTreeNode; import com.jero.modules.laws.standard.mapper.LawsNodeRelationMapper; import com.jero.modules.laws.standard.mapper.LawsTreeNodeMapper; -import com.jero.modules.laws.standard.service.ILawsTreeNodeService; +import com.jero.modules.laws.standard.service.*; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,6 +38,18 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl queryTreeNodeList(String moduleCode, String nodeName, String option) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); @@ -155,14 +167,42 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl().eq(LawsTreeNode::getNodeCode, rootNodeCode)); + List idList = new ArrayList<>(); idList.add(id); - List codeList = new ArrayList<>(); - codeList.add(nodeCode); this.checkChildrenExists(id, idList); boolean ok = this.removeByIds(idList); + // 根据idList找到所有受影响的标准 + List list = lawsNodeRelationService.list(new LambdaQueryWrapper().in(LawsNodeRelation::getNodeId, idList)); // 根据节点code删除标准关联 lawsNodeRelationMapper.delete(new LambdaQueryWrapper().in(LawsNodeRelation::getNodeId, idList)); + // 将list按照Id分组 + Map> groupedByCount = list.stream() + .collect(Collectors.groupingBy(LawsNodeRelation::getUniqueRelationFlag)); + Map> filteredMap = groupedByCount.entrySet() + .stream() + .filter(entry -> entry.getValue().size() == 1) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + + List nodeRelationList = new ArrayList<>(); + for (Map.Entry> entry : filteredMap.entrySet()) { + String key = entry.getKey(); + LawsNodeRelation lawsNodeRelation = new LawsNodeRelation(); + lawsNodeRelation.setNodeId(parentNode.getId()); + lawsNodeRelation.setUniqueRelationFlag(key); + lawsNodeRelation.setNodeCode(parentNode.getNodeCode()); + nodeRelationList.add(lawsNodeRelation); + } + lawsNodeRelationService.saveBatch(nodeRelationList); return ok; }