QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yjz
2024-08-12 19:06:14 +08:00
parent 13d2e7ff4e a612e052cb
commit b0eb998119
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update/测试阶段.sql
+3
View File
@@ -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` varchar(200) NULL DEFAULT NULL COMMENT '企标编号' AFTER `del_flag`,
MODIFY COLUMN `standard_number_temp` varchar(200) NULL DEFAULT NULL COMMENT '顺序号' AFTER `standard_number`; 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`;
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
} }
queryWrapper.between(lawsConformityAssessmentLibrary.getValuationTime() != null, queryWrapper.between(lawsConformityAssessmentLibrary.getValuationTime() != null,
"t.valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime()); "t.valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime());
queryWrapper.orderByDesc("t.create_time"); queryWrapper.orderByDesc("t.valuation_time");
if (noAdminAuth()) { if (noAdminAuth()) {
String userId = UserUtils.getUserId(); String userId = UserUtils.getUserId();
queryWrapper.like("t.all_approval_user", userId); queryWrapper.like("t.all_approval_user", userId);
laws-modules/src/main/java/com/jero/modules/laws/standard/service/DictTreeService.java
+2 -1
View File
@@ -123,7 +123,8 @@ public class DictTreeService {
Set<String> rootNodeIds = rootNodes.stream().map(SysDictItem::getId).collect(Collectors.toSet()); Set<String> rootNodeIds = rootNodes.stream().map(SysDictItem::getId).collect(Collectors.toSet());
rootNodes.forEach(node -> { rootNodes.forEach(node -> {
node.setLeafFlag(matchedNodes.stream() 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); return new ArrayList<>(rootNodes);
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java
+2 -1
View File
@@ -288,7 +288,8 @@ public class PartNameServiceImpl extends ServiceImpl<PartNameMapper, PartName>
Set<String> rootNodeCodes = rootNodes.stream().map(PartName::getCode).collect(Collectors.toSet()); Set<String> rootNodeCodes = rootNodes.stream().map(PartName::getCode).collect(Collectors.toSet());
rootNodes.forEach(node -> { rootNodes.forEach(node -> {
node.setLeafFlag(matchedNodes.stream() 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); return new ArrayList<>(rootNodes);