From ad57dee52e0af660cb90f87e8ad9523ab151eafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E5=9B=BD=E4=B8=9C?= <mythxb@qq.com>
Date: Fri, 9 Dec 2022 14:52:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=83=A8=E9=97=A8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/user/SysUserMapper.xml   | 29 ++++++++++++++++---
 .../rzyc/controller/PcPersonalController.java | 20 ++++++++++++-
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml b/inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml
index 5a0ecad..a6e95b9 100644
--- a/inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml
@@ -10,6 +10,8 @@
       <result column="community_code" jdbcType="VARCHAR" property="communityCode" />
       <result column="net_code" jdbcType="VARCHAR" property="netCode" />
       <result column="SysUnitOrEntId" jdbcType="VARCHAR" property="sysunitorentid" />
+      <result column="unit_path" jdbcType="VARCHAR" property="unitPath" />
+      <result column="unit_path_name" jdbcType="VARCHAR" property="unitPathName" />
       <result column="SysDeptId" jdbcType="VARCHAR" property="sysdeptid" />
       <result column="SysUnitOrEntName" jdbcType="VARCHAR" property="sysunitorentname" />
       <result column="SysDeptName" jdbcType="VARCHAR" property="sysdeptname" />
@@ -110,10 +112,21 @@
       </where>
     </sql>
     <sql id="Base_Column_List">
-      SysUserId, UserType, SortId, OrgCode, SysUnitOrEntId, SysDeptId, SysUnitOrEntName,
+      SysUserId, UserType, SortId, OrgCode,
+      area_code,
+      area_path,
+      area_name,
+      SysUnitOrEntId,
+      unit_path,
+      unit_path_name,
+      SysDeptId, SysUnitOrEntName,
       SysDeptName, SysUserName, SysPassword, UserRoles, ChinaName, Description, PinYin,
       IDCard, SysSex, Birthplace, Birthday, HealthStatus, SysPhoto, EducationLevel, SysFamily,
-      Marriage, Duration, SysTitle, OfficeTel, MobileTel, Email, QQInter, WeixinInter,
+      Marriage, Duration,
+        SysTitle,
+        post_path,
+        post_name,
+    OfficeTel, MobileTel, Email, QQInter, WeixinInter,
       ModifiedBy, ModifiedOn, CreatedBy, CreatedOn
     </sql>
     <select id="selectByExample" parameterType="com.rzyc.model.user.SysUserExample" resultMap="BaseResultMap">
@@ -164,7 +177,10 @@
                            area_path,
                            area_name,
                            supervise_area,
-                           SysUnitOrEntId, SysDeptId,
+                           SysUnitOrEntId,
+                           unit_path,
+                           unit_path_name,
+                           SysDeptId,
         SysUnitOrEntName, SysDeptName, SysUserName,
         SysPassword, UserRoles, ChinaName,
         Description, PinYin, IDCard,
@@ -187,7 +203,10 @@
         #{areaPath,jdbcType=VARCHAR},
         #{areaName,jdbcType=VARCHAR},
         #{superviseArea,jdbcType=VARCHAR},
-              #{sysunitorentid,jdbcType=VARCHAR}, #{sysdeptid,jdbcType=VARCHAR},
+              #{sysunitorentid,jdbcType=VARCHAR},
+              #{unitPath,jdbcType=VARCHAR},
+              #{unitPathName,jdbcType=VARCHAR},
+              #{sysdeptid,jdbcType=VARCHAR},
         #{sysunitorentname,jdbcType=VARCHAR}, #{sysdeptname,jdbcType=VARCHAR}, #{sysusername,jdbcType=VARCHAR},
         #{syspassword,jdbcType=VARCHAR}, #{userroles,jdbcType=VARCHAR}, #{chinaname,jdbcType=VARCHAR},
         #{description,jdbcType=VARCHAR}, #{pinyin,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR},
@@ -963,6 +982,8 @@
           area_name = #{record.areaName,jdbcType=VARCHAR},
           supervise_area = #{record.superviseArea,jdbcType=VARCHAR},
           SysUnitOrEntId = #{record.sysunitorentid,jdbcType=VARCHAR},
+          unit_path = #{record.unitPath,jdbcType=VARCHAR},
+          unit_path_name = #{record.unitPathName,jdbcType=VARCHAR},
           SysDeptId = #{record.sysdeptid,jdbcType=VARCHAR},
           SysUnitOrEntName = #{record.sysunitorentname,jdbcType=VARCHAR},
           SysDeptName = #{record.sysdeptname,jdbcType=VARCHAR},
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
index 67f97be..b45ef2a 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
@@ -950,6 +950,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
 
                 getUserAreaCode(changeUserDto.getAreaCode(),sysUser);
                 getUserPost(changeUserDto.getSystitle(),sysUser);
+                getUserUnit(sysUser.getSysunitorentid(),sysUser);
                 sysUserMapper.changeUser(sysUser);
                 //处理监管地区
                 changeSuperviseArea(sysUser.getSysuserid(),changeUserDto.getSuperviseAreaId(),operator.getChinaname());
@@ -967,7 +968,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
                 sysUser.setSyspassword(passwd);
                 getUserPost(changeUserDto.getSystitle(),sysUser);
                 getUserAreaCode(changeUserDto.getAreaCode(),sysUser);
-
+                getUserUnit(sysUser.getSysunitorentid(),sysUser);
                 sysUserMapper.insert(sysUser);
                 //处理监管地区
                 changeSuperviseArea(sysUser.getSysuserid(),changeUserDto.getSuperviseAreaId(),operator.getChinaname());
@@ -979,6 +980,23 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
         return result;
     }
 
+    /**
+     * 处理用户部门信息
+     * @version v1.0
+     * @author dong
+     * @date 2022/12/9 14:07
+     */
+    public void getUserUnit(String unitId,SysUser user)throws Exception{
+        if(StringUtils.isNotBlank(unitId)){
+            SysUnit sysUnit = sysUnitMapper.selectByPrimaryKey(unitId);
+            if(null != sysUnit){
+                user.setSysunitorentid(unitId);
+                user.setUnitPath(sysUnit.getParentPath());
+                user.setUnitPathName(sysUnit.getParentName());
+            }
+        }
+    }
+
     /**
      * 处理企业地区信息
      * @version v1.0