From 990ea8814d03c0dee349b88f406c2441693cf8b6 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Tue, 19 Dec 2023 18:00:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E7=81=AB=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E6=95=B0=E6=8D=AE=E5=BB=B6=E6=97=B6=E7=9B=91=E7=81=AB?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BA=BA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppHotWorkApplicationController.java            | 13 +++++++++----
 .../highriskwork/HotWorkApplicationUserMapper.xml   | 12 ++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java
index 275ae9bd..f696040b 100644
--- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java
+++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java
@@ -827,11 +827,16 @@ public class AppHotWorkApplicationController extends BaseController {
 				return map;
 			}
 		} else {
-			hotUserList = hotWorkApplicationUserService.listByDepartment(hotUserPd); // 找到这一笔的审批人们
+			//先判断延时监火是否为选择部门
+			hotUserList = hotWorkApplicationUserService.listByDepartment(hotUserPd); // 找到这一笔的审批人们（选择部门）
 			if (hotUserList.size() < 1) {
-				map.put("result", "error");
-				map.put("msg", "获取审批人意见失败！请联系管理员");
-				return map;
+				//如果查询部门查不到就根据人查询
+				hotUserList = hotWorkApplicationUserService.listAll(hotUserPd); // 找到这一笔的审批人（选择人）
+				if (hotUserList.size() != 1) {
+					map.put("result", "error");
+					map.put("msg", "获取审批人意见失败！请联系管理员");
+					return map;
+				}
 			}
 		}
 
diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml
index c717f435..9ba0ada9 100644
--- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml
+++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml
@@ -134,21 +134,23 @@
 	<select id="listAll" parameterType="pd" resultType="pd">
 		select
 		<include refid="Field"></include>
-		,dept.NAME as deptName
+		,if(dept.NAME is null,dept1.NAME,dept.NAME) as deptName
 		,u.NAME as userName
 		,su.USERNAME as userName2
 		, u.USERNAME as userPhone
-		,dept.DEPARTMENT_ID DEPARTMENT_ID
+		,if(dept.DEPARTMENT_ID is null,dept1.DEPARTMENT_ID,dept.DEPARTMENT_ID) as DEPARTMENT_ID
 		,su.USER_TYPE USER_TYPE
 		,reuser.NAME as REGULATORY_USER_NAME
-		,redept.NAME  as REGULATORY_DEPT_NAME
+		,if(redept.NAME is null,redept1.NAME,redept.NAME) as REGULATORY_DEPT_NAME
 		from
 		<include refid="tableName"></include> f
 		left join SYS_USER u on u.USER_ID = f.USER_ID
 		left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID
 		left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID
+		left join oa_department dept1 on dept1.DEPARTMENT_ID = f.USER_ID
 		left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
 		left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID
+		left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept1 on redept1.DEPARTMENT_ID = f.USER_ID
 		where f.ISDELETE = '0'
 		<if test="hotIds != null and hotIds.size>0"> <!-- 关键词检索 -->
 			and(f.FOREIGN_KEY in
@@ -216,7 +218,7 @@
 		    f.OPERATTIME,
 		    s.NAME,
 		    f.TYPE,
-			u.NAME as USER_NAME,
+			if(u.NAME is null,od.NAME,u.NAME) as USER_NAME,
 			su.USERNAME as SPECIAL_USER_NAME,
 			reuser.NAME as REGULATORY_USER_NAME
 		FROM
@@ -225,6 +227,8 @@
 			left join SYS_USER u on u.USER_ID = f.USER_ID
 			left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID
 			left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin'
+			left join oa_department od on od.DEPARTMENT_ID = f.USER_ID
+			left join `qa-gwj-regulatory`.SYS_DEPARTMENT rd on rd.DEPARTMENT_ID = f.USER_ID
 		WHERE
 		    f.FOREIGN_KEY = #{FOREIGN_KEY}
 	  		AND f.ISDELETE = '0'