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 @@ and f.CORPINFO_ID != #{pd.ENTERPRISE_SIDE} + + and f.MIGRATION_FLAG = #{pd.MIGRATION_FLAG} + + + and (f.MIGRATION_FLAG = '0' or f.MIGRATION_FLAG is null) + order by f.ISTOPTIME desc,f.CREATED_TIME desc