From d1157ed1451210821dde0418f8d0204cf60723e9 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 31 Jul 2024 10:47:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E6=80=A7=E8=AF=84=E4=BC=B0=E5=BA=93=E6=90=9C=E7=B4=A0SQL?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsConformityAssessmentLibraryMapper.xml | 21 ++++++++++++-------
 ...onformityAssessmentLibraryServiceImpl.java |  4 ++--
 2 files changed, 16 insertions(+), 9 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 3cb8a6a8..424d6afe 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
@@ -18,15 +18,22 @@
     </sql>
 
     <select id="queryByPage" resultType="com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary">
-        select cs.id,
+        SELECT cs.id,
                cs.standard_id,
-               IF(cs.standard_id IS NOT NULL, d.standard_number, cs.standard_number) AS standard_number,
-               IF(cs.standard_id IS NOT NULL, d.standard_name, cs.standard_name)     AS standard_name,
-               lms.country as applicableMarket,
+               sub.standard_number,
+               sub.standard_name,
+               lms.country AS applicableMarket,
                cs.valuation_time
-        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
+        FROM laws_conformity_assessment_library cs
+                 LEFT JOIN (
+            SELECT
+                   COALESCE(d.standard_number, cs.standard_number) AS standard_number,
+                   COALESCE(d.standard_name, cs.standard_name) AS standard_name,
+                   cs.standard_id
+            FROM laws_conformity_assessment_library cs
+                     LEFT JOIN laws_domestic_standard d ON d.id = cs.standard_id
+        ) AS sub ON sub.standard_id = cs.standard_id
+                 LEFT JOIN laws_market_standard lms ON lms.id = cs.applicable_market
             ${ew.customSqlSegment}
     </select>
 
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 ea293728..6a809870 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,9 +81,9 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
         QueryWrapper<LawsConformityAssessmentLibrary> queryWrapper = new QueryWrapper<>();
         Page<LawsConformityAssessmentLibrary> page = new Page<>(pageNo, pageSize);
         queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardNumber()),
-                "d.standard_number", lawsConformityAssessmentLibrary.getStandardNumber());
+                "sub.standard_number", lawsConformityAssessmentLibrary.getStandardNumber());
         queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardName()),
-                "d.standard_name", lawsConformityAssessmentLibrary.getStandardName());
+                "sub.standard_name", lawsConformityAssessmentLibrary.getStandardName());
         String applicableMarkets = lawsConformityAssessmentLibrary.getApplicableMarket();
         if (StringUtils.isNotBlank(applicableMarkets)) {
             String[] split = applicableMarkets.split(",");