From 8f224cc693df12b2469ad444c7f62ff1682cb12a Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 12 Mar 2025 09:33:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E4=BA=8B=E4=BB=B6=20?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E5=92=8C=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/FxfxdxMapper.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml
index 831084c..b25e687 100644
--- a/src/main/resources/mapper/FxfxdxMapper.xml
+++ b/src/main/resources/mapper/FxfxdxMapper.xml
@@ -126,8 +126,10 @@
 			a.ID AS fengxianshijianbianh,
 			f.ACCOUNTDESC AS chuangjianren,
 			FORMAT(a.CREASTAMP, 'yyyy-MM-dd HH:mm:ss') AS chuangjianshijian,
-			c.fdutydeptid AS zerenbumen,
-    		c.fdutyid AS fdutyid,
+			--c.fdutydeptid AS zerenbumen,
+			d.ORGANNAME AS zerenbumen,
+			--c.fdutyid AS zerenren,
+			e.EMPNAME AS zerenren,
     		a.NAME AS kenengfashengdeshigu
 		FROM
 			ISM_RISKEVENT a
@@ -137,6 +139,10 @@
 		LEFT JOIN ISM_HAZARDUNIT c ON a.RISKUNITID = c.ID
 		-- 左连接账户表
 		LEFT JOIN PF_ACCOUNT f ON a.CREATOR = f.id
+		--左连接部门表
+		left join PF_ORGAN d on c.FDUTYDEPTID  = d.ID
+		--左连接员工表
+		left join PF_EMPLOYEE e on c.FDUTYID  = e.ID
 		WHERE a.ISDELETE = 'N'
 	</select>