From 3c6e5fb59dfe328b6bebbbdcf930e74ff730aa4a Mon Sep 17 00:00:00 2001
From: wangpeng <wangpeng@zcloudchina.com>
Date: Thu, 1 Feb 2024 17:07:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E9=9A=90=E6=82=A3=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E6=8E=92=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomItemMapper.xml                         |  5 +----
 .../hiddenDangerCheckStandard/CustomMapper.xml   | 16 +++++-----------
 2 files changed, 6 insertions(+), 15 deletions(-)

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
 			<include refid="tableName"></include> 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'
 			<if test="CUSTOM_ID != null and CUSTOM_ID != ''"><!-- 关键词检索 -->
 				and f.CUSTOM_ID = #{CUSTOM_ID}
 			</if>
-			<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
-				and f.CORPINFO_ID = #{CORPINFO_ID}
-			</if>
 		GROUP BY f.CHECK_ITEM
 		ORDER BY d.DICTIONARY_SORT ASC
 	</select>
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}
-		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
-			and
-			(
-			bhci.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
-			)
+		<if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 -->
+			and bhci.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
 		</if>
 		GROUP BY f.CUSTOM_ID
-		ORDER BY f.COMMON_ITEM_SORT ASC
+		ORDER BY f.OPERATTIME DESC
 	</select>
 
 	<!-- 清单检查分页 -->