From 5668555c19ec553bd13a116aff356879d22546e2 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Tue, 16 Jan 2024 16:37:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B):=2080050?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/common/mapper/xml/LawsCommonMapper.xml       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 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 efc4f2b6..a8b6f82c 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,6 +49,7 @@
 
     <select id="getManyStandardSelectionBox"
             resultType="com.jero.modules.laws.common.vo.ManyStandardSelectionBox">
+        select * from (
         SELECT standard.id, standard.standard_number, standard.standard_name, standard.release_date, standard.standard_state, standard.source, standard.create_time
         FROM
         (SELECT id, standard_number, standard_name, release_date, standard_state, '1' AS source, create_time
@@ -73,8 +74,8 @@
         <if test="vo.releaseSplitFlag != null and vo.releaseSplitFlag != ''">
             AND standard.id IS NOT NULL
             AND split.del_flag = 0
-            AND split.publish_before_id IS NOT NULL AND split.publish_before_id != ''
-            AND split.file_type IS NOT NULL AND split.file_type != ''
+            AND split.publish_before_id IS NULL
+            AND split.split_status = '2'
         </if>
         <if test="vo.source != null and vo.source != ''">
             AND standard.source LIKE CONCAT('%', #{vo.source}, '%')
@@ -96,7 +97,11 @@
             </foreach>
         </if>
         </where>
-        ORDER BY standard.create_time DESC
+        <if test="vo.releaseSplitFlag != null and vo.releaseSplitFlag != ''">
+            GROUP BY id
+        </if>
+        ) t
+        ORDER BY create_time DESC
     </select>
     <select id="getSingleStandard" resultType="com.jero.modules.laws.common.vo.ManyStandardSelectionBox">
         SELECT id, standard_number, standard_name, release_date, standard_state