From 364da7ed77796f18386fe97fbd4e4b2e3942ebc6 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Fri, 10 Nov 2023 19:27:04 +0800
Subject: [PATCH] =?UTF-8?q?fix=2078396=20=E6=A0=87=E5=87=86=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9--=E6=9F=A5=E8=AF=A2--=E6=9D=A5=E6=BA=90=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/common/mapper/xml/LawsCommonMapper.xml       | 11 ++++++-----
 .../common/service/impl/LawsCommonServiceImpl.java    |  5 -----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
index bc14198f..590ad14b 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
@@ -49,24 +49,24 @@
 
     <select id="getManyStandardSelectionBox"
             resultType="com.jero.modules.laws.common.vo.ManyStandardSelectionBox">
-        SELECT id, standard_number, standard_name, release_date, standard_state, source
+        SELECT id, standard_number, standard_name, release_date, standard_state, source, create_time
         FROM
-        (SELECT id, standard_number, standard_name, release_date, standard_state, '1' AS source
+        (SELECT id, standard_number, standard_name, release_date, standard_state, '1' AS source, create_time
         FROM laws_domestic_standard
         WHERE del_flag = 0
 
         UNION ALL
 
-        SELECT id, standard_number, standard_name, release_date, standard_state, '2' AS source
+        SELECT id, standard_number, standard_name, release_date, standard_state, '2' AS source, create_time
         FROM laws_overseas_standard
         WHERE del_flag = 0
 
         UNION ALL
 
-        SELECT id, standard_number, standard_name, release_date, standard_state, '3' AS source
+        SELECT id, standard_number, standard_name, release_date, standard_state, '3' AS source, create_time
         FROM laws_enterprise_standard
         WHERE del_flag = 0) standard
-        WHERE del_flag = 0
+        <where>
         <if test="vo.source != null and vo.source != ''">
             AND source = #{vo.source}
         </if>
@@ -80,6 +80,7 @@
         <if test="vo.excludeStandardNumbers != null and vo.excludeStandardNumbers != ''">
             AND standard_number NOT LIKE CONCAT('%', #{vo.excludeStandardNumbers}, '%')
         </if>
+        </where>
         ORDER BY create_time DESC
     </select>
     <select id="getSingleStandard" resultType="com.jero.modules.laws.common.vo.ManyStandardSelectionBox">
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index bc12f06e..af124017 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -1167,11 +1167,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
     @Override
     public IPage<ManyStandardSelectionBox> getManyStandardSelectionBox(ManyStandardSelectionBoxVO selectionBoxVO, Integer pageNo, Integer pageSize) {
         Page<ManyStandardSelectionBox> page = new Page<>(pageNo, pageSize);
-        // 来源不能为空
-        if (StringUtils.isBlank(selectionBoxVO.getSource())) {
-            throw new JeroBootException(ResultCommon.EMPTY_SOURCE, "");
-        }
-        selectionBoxVO.setSource(TableNameEnum.getTableName(selectionBoxVO.getSource()));
         return lawsCommonMapper.getManyStandardSelectionBox(page, selectionBoxVO);
     }