From f5579e98566f2f3162ac4089774df92251f34147 Mon Sep 17 00:00:00 2001
From: zhangqihang <zhangqihang>
Date: Fri, 23 Feb 2024 09:06:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8=E7=8E=AF?=
 =?UTF-8?q?=E4=BF=9D=E6=A3=80=E6=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/inspection/AppSafetyEnvironmentalController.java      | 2 +-
 .../datasource/specialoperation/PersonnelManagementMapper.xml | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java
index b0c8389..39bf673 100644
--- a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java
+++ b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java
@@ -487,7 +487,7 @@ public class AppSafetyEnvironmentalController extends BaseController {
 		}
 		// 2、整理特殊数据
 		// 2、1检查人将检查状态
-		if ("2,3,4".contains(safety.getString("order"))) {
+		if ("1,2,3,4".contains(safety.getString("order"))) {
 			List<PageData> inspectors = inspectorService.listAll(condition);
 			nodes.stream()
 					.filter(n -> "1".equals(n.getOrder()))
diff --git a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
index 7747fb3..12a7b04 100644
--- a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
+++ b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
@@ -266,10 +266,12 @@
 
 	<select id="findByOutsourced" parameterType="pd" resultType="pd">
 		select
-		f.*
+		f.*,
+		u.UNITS_NAME
 		from
 		<include refid="tableName"></include> f
 		left join BUS_OUTSOURCED t on t.UNITS_PIC = f.PERSONNELMANAGEMENT_ID
+		left join bus_units u on f.UNITS_ID = u.UNITS_ID
 		where
 		t.OUTSOURCED_ID = #{OUTSOURCED_ID}
 		and t.ISDELETE = '0'