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

fix: 88348 法规符合性评估库--进入页面提示操作失败

Browse Source
This commit is contained in:
mzaxd
2024-08-09 11:05:58 +08:00
parent 60b565daa2
commit 2b0c4252c8
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml
+3 -1
View File
@@ -25,7 +25,9 @@
IF(cs.standard_id IS NOT NULL, d.standard_name, cs.standard_name) AS standard_name, IF(cs.standard_id IS NOT NULL, d.standard_name, cs.standard_name) AS standard_name,
lms.country as applicableMarket, lms.country as applicableMarket,
cs.valuation_time, cs.valuation_time,
cs.create_time cs.create_time,
cs.all_approval_user,
lms.country
from laws_conformity_assessment_library cs from laws_conformity_assessment_library cs
left join laws_domestic_standard as d on d.id = cs.standard_id left join laws_domestic_standard as d on d.id = cs.standard_id
left join laws_market_standard as lms on lms.id = cs.applicable_market) as t left join laws_market_standard as lms on lms.id = cs.applicable_market) as t
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
+7 -7
View File
@@ -81,25 +81,25 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
QueryWrapper<LawsConformityAssessmentLibrary> queryWrapper = new QueryWrapper<>(); QueryWrapper<LawsConformityAssessmentLibrary> queryWrapper = new QueryWrapper<>();
Page<LawsConformityAssessmentLibrary> page = new Page<>(pageNo, pageSize); Page<LawsConformityAssessmentLibrary> page = new Page<>(pageNo, pageSize);
queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardNumber()), queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardNumber()),
"standard_number", lawsConformityAssessmentLibrary.getStandardNumber()); "t.standard_number", lawsConformityAssessmentLibrary.getStandardNumber());
queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardName()), queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardName()),
"standard_name", lawsConformityAssessmentLibrary.getStandardName()); "t.standard_name", lawsConformityAssessmentLibrary.getStandardName());
String applicableMarkets = lawsConformityAssessmentLibrary.getApplicableMarket(); String applicableMarkets = lawsConformityAssessmentLibrary.getApplicableMarket();
if (StringUtils.isNotBlank(applicableMarkets)) { if (StringUtils.isNotBlank(applicableMarkets)) {
String[] split = applicableMarkets.split(","); String[] split = applicableMarkets.split(",");
for (String splitStr : split) { for (String splitStr : split) {
queryWrapper.like("country", splitStr); queryWrapper.like("t.country", splitStr);
} }
} }
if (StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getSelections())) { if (StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getSelections())) {
queryWrapper.in("id", Arrays.asList(lawsConformityAssessmentLibrary.getSelections().split(","))); queryWrapper.in("t.id", Arrays.asList(lawsConformityAssessmentLibrary.getSelections().split(",")));
} }
queryWrapper.between(lawsConformityAssessmentLibrary.getValuationTime() != null, queryWrapper.between(lawsConformityAssessmentLibrary.getValuationTime() != null,
"valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime()); "t.valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime());
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("t.create_time");
if (noAdminAuth()) { if (noAdminAuth()) {
String userId = UserUtils.getUserId(); String userId = UserUtils.getUserId();
queryWrapper.like("all_approval_user", userId); queryWrapper.like("t.all_approval_user", userId);
} }
return lawsConformityAssessmentLibraryMapper.queryByPage(page, queryWrapper); return lawsConformityAssessmentLibraryMapper.queryByPage(page, queryWrapper);
} }