From 2b0c4252c8cb8017f4af8c1669854b5d7cf5228f Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 9 Aug 2024 11:05:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2088348=20=E6=B3=95=E8=A7=84=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E8=AF=84=E4=BC=B0=E5=BA=93--=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E9=A1=B5=E9=9D=A2=E6=8F=90=E7=A4=BA=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xml/LawsConformityAssessmentLibraryMapper.xml | 4 +++- ...LawsConformityAssessmentLibraryServiceImpl.java | 14 +++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml index be2926fa..4752fdf0 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml @@ -25,7 +25,9 @@ IF(cs.standard_id IS NOT NULL, d.standard_name, cs.standard_name) AS standard_name, lms.country as applicableMarket, cs.valuation_time, - cs.create_time + cs.create_time, + cs.all_approval_user, + lms.country from laws_conformity_assessment_library cs 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 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 d03fb047..15098d99 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 @@ -81,25 +81,25 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); Page page = new Page<>(pageNo, pageSize); queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardNumber()), - "standard_number", lawsConformityAssessmentLibrary.getStandardNumber()); + "t.standard_number", lawsConformityAssessmentLibrary.getStandardNumber()); queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardName()), - "standard_name", lawsConformityAssessmentLibrary.getStandardName()); + "t.standard_name", lawsConformityAssessmentLibrary.getStandardName()); String applicableMarkets = lawsConformityAssessmentLibrary.getApplicableMarket(); if (StringUtils.isNotBlank(applicableMarkets)) { String[] split = applicableMarkets.split(","); for (String splitStr : split) { - queryWrapper.like("country", splitStr); + queryWrapper.like("t.country", splitStr); } } 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, - "valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime()); - queryWrapper.orderByDesc("create_time"); + "t.valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime()); + queryWrapper.orderByDesc("t.create_time"); if (noAdminAuth()) { String userId = UserUtils.getUserId(); - queryWrapper.like("all_approval_user", userId); + queryWrapper.like("t.all_approval_user", userId); } return lawsConformityAssessmentLibraryMapper.queryByPage(page, queryWrapper); }