diff --git a/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml b/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml index 7dd6c94..a392491 100644 --- a/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml +++ b/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml @@ -144,6 +144,7 @@ f left join sys_user su on f.UPLOAD_USER = su.USER_ID left join bus_corp_info bci on bci.CORPINFO_ID = su.CORPINFO_ID + left join bus_library_labels b ON b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID where f.ISDELETE = '0' and f.REMARKS LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') @@ -166,12 +167,10 @@ ) - and (exists(select 1 from bus_library_labels b where b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID and b.CATEGORY_ID = #{pd.CATEGORY_ID}) - or exists(select 1 from bus_library_labels b where b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID and b.CATEGORY_ID = #{pd.TYPE_ONE})) + and b.CATEGORY_ID in (#{pd.CATEGORY_ID}, #{pd.TYPE_ONE}) - and (exists(select 1 from bus_library_labels b where b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID and b.CATEGORY_ID = #{pd.plan}) - and exists(select 1 from bus_library_labels b where b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID and b.CATEGORY_ID = #{pd.TYPE_ONE})) + and b.CATEGORY_ID in ( #{pd.plan}, #{pd.TYPE_ONE}) and f.CORPINFO_ID = #{pd.CORPINFO_ID} diff --git a/src/main/resources/mybatis/datasource/filemanager/MfolderStipulateMapper.xml b/src/main/resources/mybatis/datasource/filemanager/MfolderStipulateMapper.xml index b4b28e1..7431f19 100644 --- a/src/main/resources/mybatis/datasource/filemanager/MfolderStipulateMapper.xml +++ b/src/main/resources/mybatis/datasource/filemanager/MfolderStipulateMapper.xml @@ -231,9 +231,6 @@ from f where 1 =1 - - and f.CORPINFO_ID = #{CORPINFO_ID} - and f.PARENT_ID = #{PARENT_ID}