From f93c185fb08c37ea915a08c530fa1147ae3d8ad6 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sun, 28 Apr 2024 14:30:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E9=A1=B9=E5=88=B6=E5=BA=A6=E5=BA=93?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/controller/depository/TextLibraryController.java | 3 +--
 .../mybatis/datasource/depository/TextLibraryMapper.xml     | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/depository/TextLibraryController.java b/src/main/java/com/zcloud/controller/depository/TextLibraryController.java
index 739f5228..d3b81c71 100644
--- a/src/main/java/com/zcloud/controller/depository/TextLibraryController.java
+++ b/src/main/java/com/zcloud/controller/depository/TextLibraryController.java
@@ -106,8 +106,7 @@ public class TextLibraryController extends BaseController {
         } else {
             pd.put("CATEGORY_ID", corp_info.getString("CORP_TYPE4"));
         }
-        if (StringUtils.isEmpty(pd.getString("CORPINFO_ID")))
-        pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
+        if (StringUtils.isEmpty(pd.getString("CORPINFO_ID")))pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
 
         if ("3".equals(pd.getString("ASSOCIATION"))) {
             pd.put("TYPE_ONE", "43ed4012090d4614bb35da60d06c8264");
diff --git a/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml b/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml
index 46ef1d8c..90e65317 100644
--- a/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml
+++ b/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml
@@ -178,6 +178,12 @@
 		<if test="pd.ENTERPRISE_SIDE != null and pd.ENTERPRISE_SIDE != ''">
 			and f.CORPINFO_ID != #{pd.ENTERPRISE_SIDE}
 		</if>
+		<if test="pd.MIGRATION_FLAG != null and pd.MIGRATION_FLAG != ''">
+			and f.MIGRATION_FLAG = #{pd.MIGRATION_FLAG}
+		</if>
+		<if test="pd.LIBRARY_FLAG != null and pd.LIBRARY_FLAG != ''">
+			and (f.MIGRATION_FLAG = '0' or f.MIGRATION_FLAG is null)
+		</if>
 		order by f.ISTOPTIME desc,f.CREATED_TIME desc
 	</select>