From eca9838520a855223e5b30a4385635350d26c253 Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Mon, 6 May 2024 17:43:45 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96=20=E8=90=A5=E8=BF=90?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=92=8C=E8=B4=A7=E8=BF=90=E6=8C=82=E8=BD=A6?=
 =?UTF-8?q?=E7=9A=84=E9=83=A8=E9=97=A8=E6=98=BE=E7=A4=BAID=20=E4=BA=8B?=
 =?UTF-8?q?=E6=95=85=E7=9A=84=E4=BA=BA=E5=91=98=E6=98=BE=E7=A4=BAID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operatingvehicles/OperatingVehiclesController.java    | 1 -
 .../TrafficSecurityAccidentInvestigationMapper.xml        | 4 +++-
 .../datasource/freighttrailer/FreightTrailerMapper.xml    | 4 +++-
 .../operatingvehicles/OperatingVehiclesMapper.xml         | 8 ++++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java
index 8157205..45aacfa 100644
--- a/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java
+++ b/src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java
@@ -217,7 +217,6 @@ public class OperatingVehiclesController extends BaseController {
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());    //企业ID
         page.setPd(pd);
         List<PageData> varList = operatingVehiclesService.list(page);    //列出Question列表
-
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);
diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml
index 7cf0b63..93ee696 100644
--- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml
+++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml
@@ -361,10 +361,12 @@
     <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
         select
         <include refid="Field"></include>,
-        i.CORP_NAME
+        i.CORP_NAME,
+        su.NAME AS CASUALTYNAME
         from
         <include refid="tableName"></include> f
         left join bus_corp_info i on f.DEPARTMENT = i.CORPINFO_ID
+        LEFT JOIN sys_user su on su.USER_ID = f.USER_ID
         where
         f.ACCIDENTINVESTIGATION_ID = #{ACCIDENTINVESTIGATION_ID}
     </select>
diff --git a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml
index fa63cca..be26cf2 100644
--- a/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml
+++ b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml
@@ -216,10 +216,12 @@
 		f.CREATORNAME,
 		f.CREATTIME,
 		f.ISDELETE,
-		b.COMPANY_AREA
+		b.COMPANY_AREA,
+		dep.NAME AS DEPARTMENTNAME
 		from
 		<include refid="tableName"></include> f
 		inner join bus_corp_info b on f.CORPINFO_ID = b.CORPINFO_ID
+		LEFT JOIN oa_department dep ON dep.DEPARTMENT_ID = f.BELONGING_DEPT
 		where
 		f.FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID}
 		AND
diff --git a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml
index d4d607b..31639e8 100644
--- a/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml
+++ b/src/main/resources/mybatis/datasource/operatingvehicles/OperatingVehiclesMapper.xml
@@ -298,9 +298,11 @@
 	<!-- 通过ID获取数据 -->
 	<select id="findById" parameterType="pd" resultType="pd">
 		select
-		<include refid="Field"></include>
+		<include refid="Field"></include>,
+		dep.NAME AS DEPARTMENTNAME
 		from
 		<include refid="tableName"></include> f
+		LEFT JOIN oa_department dep on dep.DEPARTMENT_ID = f.BELONGING_DEPARTMENT
 		where
 		f.OPERATING_ID = #{OPERATING_ID} AND
 		f.ISDELETE = '0' AND
@@ -561,9 +563,11 @@
 	<!-- 列表(全部) -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
-		<include refid="Field"></include>
+		<include refid="Field"></include>,
+		dep.NAME AS DEPARTMENTNAME
 		from
 		<include refid="tableName"></include> f
+		inner join oa_department dep on dep.DEPARTMENT_ID = f.BELONGING_DEPARTMENT
 		where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
 		<if test="pd.PLATE_NUMBER != null and pd.PLATE_NUMBER != ''"><!-- 关键词检索 -->
 			and f.PLATE_NUMBER LIKE CONCAT(CONCAT('%', #{pd.PLATE_NUMBER}),'%')