diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml index 80045b9..83eb760 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml @@ -247,14 +247,11 @@ d.DICTIONARY_NAMES from f - left join BUS_HIDDENDANGERCHECKSTANDARD_DICTIONARY d on d.DICTIONARY_ID = t.CHECK_ITEM + left join BUS_HIDDENDANGERCHECKSTANDARD_DICTIONARY d on d.DICTIONARY_ID = f.CHECK_ITEM where f.ISDELETE = '0' and d.ISDELETE = '0' and f.CUSTOM_ID = #{CUSTOM_ID} - - and f.CORPINFO_ID = #{CORPINFO_ID} - GROUP BY f.CHECK_ITEM ORDER BY d.DICTIONARY_SORT ASC diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml index e788009..8473d12 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml @@ -324,7 +324,7 @@ f.NAME, t.NAME TYPENAME, p.NAME PERIODNAME, - f.USER_ID + f.USER_ID, u.NAME USER_NAME, f.START_DATE, f.END_DATE, @@ -338,19 +338,13 @@ left join OA_DEPARTMENT d on d.DEPARTMENT_ID=f.DEPARTMENT_ID left join sys_user u on u.USER_ID = f.USER_ID left join bus_hiddendangercheckstandard_custom_item bhci on bhci.CUSTOM_ID = f.CUSTOM_ID and bhci.ISDELETE = '0' - where - f.ISDELETE = 0 - and bhci.ISDELETE = 0 - and f.COMMON_STATUS = 1 + where f.ISDELETE = 0 and f.CORPINFO_ID = #{CORPINFO_ID} - - and - ( - bhci.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') - ) + + and bhci.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%') GROUP BY f.CUSTOM_ID - ORDER BY f.COMMON_ITEM_SORT ASC + ORDER BY f.OPERATTIME DESC