From c66ecc84de810e603d42fb983dd45438ac27bfee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 19 Sep 2024 14:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E6=AC=BE=E9=80=82=E7=94=A8=E5=B8=82=E5=9C=BA=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=B2=E5=8F=91=E5=B8=83=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/documenttool/mapper/xml/DocumentSplitMapper.xml  | 2 +-
 .../service/impl/DocumentSplitServiceImpl.java            | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
index 285b2043..b042d378 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
@@ -320,7 +320,7 @@
     <select id="getSplitSelectIds" resultType="java.lang.String">
         select l2.id from laws_domestic_standard l1
         left join sar_file_split_info l2 on l1.id = l2.standard_id and l2.del_flag = 0
-        where l1.del_flag = 0 and l2.id is not null
+        where l1.del_flag = 0 and l2.id is not null and split_status = 2
         and
         <foreach collection="countryList" separator="or" item= "item" open="(" close=")">
             CONCAT(',',l1.applicable_market,',') like CONCAT('%,',#{item},',%')
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
index 77d58446..bde7c2cf 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
@@ -1879,10 +1879,12 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
             // 查询市场下的标准
             List<String> countryList =  Arrays.asList(parameter.get(COUNTRY).toString().split(","));
             List<String> ids = documentSplitMapper.getSplitSelectIds(countryList);
-            if(!CollectionUtils.isEmpty(ids)){
-                // in查询
-                selectCondition.append(" and s.info_id" + " in('").append(String.join("','",ids)).append("')");
+            if(CollectionUtils.isEmpty(ids)){
+                ids = new ArrayList<>();
+                ids.add("-1");
             }
+            // in查询
+            selectCondition.append(" and s.info_id" + " in('").append(String.join("','",ids)).append("')");
             parameter.remove(COUNTRY);
         }
     }