From 0751df56519d1076f736c0653d6a77f64695bd87 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Fri, 29 Mar 2024 10:47:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=AE=89=E5=85=A8=E4=BA=8B?=
 =?UTF-8?q?=E6=95=85=E6=A1=A3=E6=A1=88bug=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/UsersController.java    | 21 +++++++++++++++++++
 .../mapper/datasource/system/UsersMapper.java |  2 ++
 .../zcloud/service/system/UsersService.java   |  2 ++
 .../service/system/impl/UsersServiceImpl.java |  6 ++++++
 ...ficSecurityAccidentInvestigationMapper.xml |  4 +++-
 .../mybatis/datasource/system/UsersMapper.xml |  9 ++++++++
 6 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java
index bee58f0..0cdefc9 100644
--- a/src/main/java/com/zcloud/controller/system/UsersController.java
+++ b/src/main/java/com/zcloud/controller/system/UsersController.java
@@ -97,6 +97,27 @@ public class UsersController extends BaseController {
         return ReturnMap.ok().put("pd", usersService.getUserByCardNo(pageData));
     }
 
+    /**
+     * 根据USERID找人
+     *
+     * @param page
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping("/getUserByUserId")
+    @ResponseBody
+    public Object getUserByUserId() {
+        Map<String, Object> map = new HashMap<>();
+        String errInfo = "success";
+        PageData pd = this.getPageData();
+        pd = usersService.getUserByUserId(pd);
+        map.put("pd",pd);
+        map.put("result", errInfo);
+        return map;
+//        PageData pageData = getPageData();
+//        pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+    }
+
     /**
      * 用户列表
      *
diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
index 1d757d3..cd2cd83 100644
--- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
@@ -293,4 +293,6 @@ public interface UsersMapper {
 	 * @param pd
 	 */
 	void editPractitioner(PageData pd);
+
+	PageData getUserByUserId(PageData pd);
 }
diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java
index 0cb0208..e604cc2 100644
--- a/src/main/java/com/zcloud/service/system/UsersService.java
+++ b/src/main/java/com/zcloud/service/system/UsersService.java
@@ -366,4 +366,6 @@ public interface UsersService {
 	 * @param pd
 	 */
 	void setPractitionerConfirm(PageData pd) throws Exception;
+
+	PageData getUserByUserId(PageData pd);
 }
diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
index 7bd395f..d2b60cf 100644
--- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
+++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
@@ -1328,4 +1328,10 @@ public class UsersServiceImpl implements UsersService {
     public void setPractitionerConfirm(PageData pd) throws Exception {
         usersMapper.setPractitionerReview(pd);
     }
+
+    @Override
+    public PageData getUserByUserId(PageData pd) {
+        return usersMapper.getUserByUserId(pd);
+    }
+
 }
diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml
index 523ee74..40b299a 100644
--- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml
+++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml
@@ -354,9 +354,11 @@
 
     <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
         select
-        <include refid="Field"></include>
+        <include refid="Field"></include>,
+        i.CORP_NAME
         from
         <include refid="tableName"></include> f
+        left join bus_corp_info i on f.DEPARTMENT = i.CORPINFO_ID
         where
         f.ACCIDENTINVESTIGATION_ID = #{ACCIDENTINVESTIGATION_ID}
     </select>
diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
index dff67a3..2992652 100644
--- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml
+++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
@@ -1777,6 +1777,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by u.SORT asc,u.LAST_LOGIN desc
 	</select>
 
+	<select id="getUserByUserId" resultType="com.zcloud.entity.PageData">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where
+		f.USER_ID = #{USER_ID}
+	</select>
+
 	<!-- 从业人员入职审核 -->
 	<update id="setPractitionerReview" parameterType="pd" >
 		update  <include refid="tableName"></include>