From bfcddb17c167387c8474539766ab6babb1a2c253 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 10 Jun 2025 14:29:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=B4=E6=97=B6=E7=94=A8?=
 =?UTF-8?q?=E7=94=B5=E4=BD=9C=E4=B8=9A=E7=A5=A8=E4=B8=8A=E4=BC=A0=E5=8E=BF?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=9C=89=E6=97=B6=E7=BC=BA=E5=A4=B1=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E4=BA=BA=E7=AD=89=E5=AD=97=E6=AE=B5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml
index 6c13967..8beaf92 100644
--- a/src/main/resources/mapper/FxfxdxMapper.xml
+++ b/src/main/resources/mapper/FxfxdxMapper.xml
@@ -1180,7 +1180,7 @@
 				ELSE '山东恒信高科能源有限公司'
 			END) AS shenqingdanwei,
 			--qiyebianma
-			--(CASE WHEN C.FNAME like '%中碳%' THEN '370980326' ELSE '370910170' END) AS qiyebianma,
+			(CASE WHEN C.FNAME like '%中碳%' THEN '370980326' ELSE '370910170' END) AS qiyebianma,
 			FORMAT(A.PBDATE,
 			'yyyy-MM-dd HH:mm:ss')as zuoyeshishikaishishi,
 			FORMAT(A.PEDATE,
@@ -1200,7 +1200,7 @@
 			 '已验收' AS zuoyezhuangtai,
 			 A.GUARDNAME AS jianhuren,
 			--作业人
-			f.EMPNAME AS zuoyeren,
+			CASE WHEN f.EMPNAME IS NULL OR f.EMPNAME = '' THEN a.ELECNAME  ELSE f.EMPNAME END AS zuoyeren,
 			--作业单位
 			A.SDUNITNAME AS zuoyedanwei,
 			-- 通过机构路径改进
@@ -1209,7 +1209,7 @@
 				else '否'
 			end) as shifouchengbaoshangz,
 			--作业负责人
-			D.FIREPERSONNAME1 AS zuoyefuzeren,
+			CASE WHEN D.FIREPERSONNAME1 IS NULL OR D.FIREPERSONNAME1 = '' THEN a.FACHEADER  ELSE D.FIREPERSONNAME1 END AS zuoyefuzeren,
 			(CASE
 				WHEN (F.MOBILE IS NULL
 				OR F.MOBILE = '') THEN '13053831511'
diff --git a/src/main/resources/mapper/ZypSingleQueryMapper.xml b/src/main/resources/mapper/ZypSingleQueryMapper.xml
index 8833d97..19eef6c 100644
--- a/src/main/resources/mapper/ZypSingleQueryMapper.xml
+++ b/src/main/resources/mapper/ZypSingleQueryMapper.xml
@@ -565,7 +565,7 @@
 				ELSE '山东恒信高科能源有限公司'
 			END) AS shenqingdanwei,
 			--qiyebianma
-			--(CASE WHEN C.FNAME like '%中碳%' THEN '370980326' ELSE '370910170' END) AS qiyebianma,
+			(CASE WHEN C.FNAME like '%中碳%' THEN '370980326' ELSE '370910170' END) AS qiyebianma,
 			FORMAT(A.PBDATE,
 			'yyyy-MM-dd HH:mm:ss')as zuoyeshishikaishishi,
 			FORMAT(A.PEDATE,
@@ -585,7 +585,7 @@
 			 '已验收' AS zuoyezhuangtai,
 			 A.GUARDNAME AS jianhuren,
 			--作业人
-			f.EMPNAME AS zuoyeren,
+			CASE WHEN f.EMPNAME IS NULL OR f.EMPNAME = '' THEN a.ELECNAME  ELSE f.EMPNAME END AS zuoyeren,
 			--作业单位
 			A.SDUNITNAME AS zuoyedanwei,
 			-- 通过机构路径改进
@@ -594,7 +594,7 @@
 				else '否'
 			end) as shifouchengbaoshangz,
 			--作业负责人
-			D.FIREPERSONNAME1 AS zuoyefuzeren,
+			CASE WHEN D.FIREPERSONNAME1 IS NULL OR D.FIREPERSONNAME1 = '' THEN a.FACHEADER  ELSE D.FIREPERSONNAME1 END AS zuoyefuzeren,
 			(CASE
 				WHEN (F.MOBILE IS NULL
 				OR F.MOBILE = '') THEN '13053831511'