From 36d48951c8fe4cb27f9ad72c568baaf0810bbe95 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 9 Jul 2025 16:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A=E4=BA=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/FxfxdxMapper.xml         |  9 ++++++++-
 src/main/resources/mapper/ZypSingleQueryMapper.xml | 10 +++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml
index a385df0..53ec8a6 100644
--- a/src/main/resources/mapper/FxfxdxMapper.xml
+++ b/src/main/resources/mapper/FxfxdxMapper.xml
@@ -659,7 +659,14 @@
 			'' ) AS jingweidu,
 			'已验收' as zuoyezhuangtai,
 			A.GUARDNAME AS jianhuren,
-			A.ELECPRONAME AS shigongrenyuanxingmi,
+			--A.ELECPRONAME AS shigongrenyuanxingmi,
+			LEFT(STUFF(
+			COALESCE(',' + NULLIF(REPLACE( A.ELECPRONAME, ';', ','), ''), '') +
+			COALESCE(',' + NULLIF(A.elecproname, ''), '') +
+			COALESCE(',' + NULLIF(A.elecname, ''), '') +
+			COALESCE(',' + NULLIF(A.promanager, ''), '') +
+			COALESCE(',' + NULLIF(A.prosafe, ''), ''), 1, 1, ''
+			), 69) AS shigongrenyuanxingmi,
 			A.SDUNITNAME AS zuoyedanwei,
 			-- 通过机构路径改进
 			 (case
diff --git a/src/main/resources/mapper/ZypSingleQueryMapper.xml b/src/main/resources/mapper/ZypSingleQueryMapper.xml
index fde1389..8292244 100644
--- a/src/main/resources/mapper/ZypSingleQueryMapper.xml
+++ b/src/main/resources/mapper/ZypSingleQueryMapper.xml
@@ -42,7 +42,15 @@
 			'' ) AS jingweidu,
 			'已验收' as zuoyezhuangtai,
 			A.GUARDNAME AS jianhuren,
-			A.ELECPRONAME AS shigongrenyuanxingmi,
+			--A.ELECPRONAME AS shigongrenyuanxingmi,
+			LEFT(STUFF(
+			COALESCE(',' + NULLIF(REPLACE( A.ELECPRONAME, ';', ','), ''), '') +
+			COALESCE(',' + NULLIF(A.elecproname, ''), '') +
+			COALESCE(',' + NULLIF(A.elecname, ''), '') +
+			COALESCE(',' + NULLIF(A.promanager, ''), '') +
+			COALESCE(',' + NULLIF(A.prosafe, ''), ''), 1, 1, ''
+			), 69) AS shigongrenyuanxingmi,
+			A.SDUNITNAME AS zuoyedanwei,
 			A.SDUNITNAME AS zuoyedanwei,
 			-- 通过机构路径改进
 			 (case