diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index 35069b5e..01ad5eb1 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -37,6 +37,9 @@ ALTER TABLE `laws_enterprise_standard` MODIFY COLUMN `standard_number` varchar(200) NULL DEFAULT NULL COMMENT '企标编号' AFTER `del_flag`, MODIFY COLUMN `standard_number_temp` varchar(200) NULL DEFAULT NULL COMMENT '顺序号' AFTER `standard_number`; +ALTER TABLE `process_standard_compliance_check` + MODIFY COLUMN `applicable_market_no` varchar(2000) NULL DEFAULT NULL COMMENT '适用市场清单编号' AFTER `applicable_market`; + diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java index f7bddd5e..bcfce97b 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java @@ -97,7 +97,7 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl rootNodeIds = rootNodes.stream().map(SysDictItem::getId).collect(Collectors.toSet()); rootNodes.forEach(node -> { node.setLeafFlag(matchedNodes.stream() - .noneMatch(n -> rootNodeIds.contains(n.getParentId()))); + .noneMatch(n -> (rootNodeIds.contains(n.getParentId()) && + n.getParentId().equals(node.getId())))); }); return new ArrayList<>(rootNodes); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java index d12c4c97..3cc2fd67 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java @@ -288,7 +288,8 @@ public class PartNameServiceImpl extends ServiceImpl Set rootNodeCodes = rootNodes.stream().map(PartName::getCode).collect(Collectors.toSet()); rootNodes.forEach(node -> { node.setLeafFlag(matchedNodes.stream() - .noneMatch(n -> rootNodeCodes.contains(n.getParentCode()))); + .noneMatch(n -> (rootNodeCodes.contains(n.getParentCode()) && + n.getParentCode().equals(node.getCode())))); }); return new ArrayList<>(rootNodes);