生成安全事故档案bug优化

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());
+    }
+
     /**
      * 用户列表
      *

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);
 }

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);
 }

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);
+    }
+
 }

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>

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>