用户地区信息修改

inventory-dao/src/main/java/com/rzyc/bean/user/dto/ChangeUserDto.java

@@ -24,6 +24,9 @@ public class ChangeUserDto {
     @ApiModelProperty("网格id")
     private String netCode;
 
+    @ApiModelProperty("地区id")
+    private String areaCode;
+
     @ApiModelProperty("监管地区id 多个逗号隔开")
     private String superviseAreaId;
 
@@ -68,6 +71,14 @@ public class ChangeUserDto {
     @ApiModelProperty(value = "用户类型 1：区级用户 2：镇正领导 3:镇副领导 4：驻村干部 5：社区 6：其他",required = true)
     private Integer memberType = 6;
 
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+
     public Integer getMemberType() {
         return memberType;
     }

inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java

@@ -78,7 +78,8 @@ public interface ListPerformMapper {
     /*岗位分页*/
     List<ListPerform> performPage(@Param("supClassId") String supClassId,
                                   @Param("performId") String performId,
-                                  @Param("condition") String condition);
+                                  @Param("condition") String condition,
+                                  @Param("superPerformId") String superPerformId);
 
     /*修改岗位*/
     Integer changeListPerform(@Param("record") ListPerform record);
@@ -97,7 +98,7 @@ public interface ListPerformMapper {
                            @Param("supClassId") String supClassId);
 
     //部门列表
-    List<ListPerform> findUnit();
+    List<ListPerform> findUnit(@Param("superPerformId") String superPerformId);
 
     /*部门履职信息*/
     List<UnitList> unitPerformInfo(@Param("supClassId") String supClassId,

inventory-dao/src/main/java/com/rzyc/model/user/SysUser.java

@@ -41,6 +41,15 @@ public class SysUser implements Serializable {
     @ApiModelProperty("监管地区id 多个逗号隔开")
     private String superviseArea;
 
+    @ApiModelProperty("地区id")
+    private String areaCode;
+
+    @ApiModelProperty("父级地区id")
+    private String areaPath;
+
+    @ApiModelProperty("父级地区名")
+    private String areaName;
+
     private String sysunitorentid;
 
     private String sysdeptid;
@@ -233,6 +242,30 @@ public class SysUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+
+    public String getAreaPath() {
+        return areaPath;
+    }
+
+    public void setAreaPath(String areaPath) {
+        this.areaPath = areaPath;
+    }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
     public Integer getManageState() {
         return manageState;
     }

inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml

@@ -17,6 +17,8 @@
     <result column="CreatedBy" jdbcType="VARCHAR" property="createdby" />
     <result column="ModifiedOn" jdbcType="TIMESTAMP" property="modifiedon" />
     <result column="ModifiedBy" jdbcType="VARCHAR" property="modifiedby" />
+    <result column="parent_path" jdbcType="VARCHAR" property="parentPath" />
+    <result column="parent_name" jdbcType="VARCHAR" property="parentName" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.rzyc.model.user.ListPerform">
     <result column="WorkDivision" jdbcType="LONGVARCHAR" property="workdivision" />
@@ -81,7 +83,7 @@
   </sql>
   <sql id="Base_Column_List">
     ListPerformId, PerformClassCode, PerformClassName, SortId, SysLevel, SupClassId,
-    completion,
+    completion,parent_path,parent_name,
     performName,
     SupClassCode, viewJurisdiction,SupClassName, CreatedOn, CreatedBy, ModifiedOn, ModifiedBy
   </sql>
@@ -150,6 +152,8 @@
       SupClassId,
       completion,
       performName,
+                             parent_path,
+                             parent_name,
       SupClassCode, viewJurisdiction,SupClassName,
       CreatedOn, CreatedBy, ModifiedOn,
       ModifiedBy, WorkDivision)
@@ -158,6 +162,8 @@
       #{supclassid,jdbcType=VARCHAR},
       #{completion,jdbcType=VARCHAR},
       #{performName,jdbcType=VARCHAR},
+      #{parentPath,jdbcType=VARCHAR},
+      #{parentName,jdbcType=VARCHAR},
       #{supclasscode,jdbcType=VARCHAR},
       #{viewJurisdiction,jdbcType=VARCHAR},
       #{supclassname,jdbcType=VARCHAR},
@@ -619,8 +625,11 @@
       <if test="null != supClassId and '' != supClassId">
         AND lp.`SupClassId` = #{supClassId}
       </if>
-    <if test="null != performId and '' != performId">
+<!--    <if test="null != performId and '' != performId">
       and lp.ListPerformId = #{performId}
+    </if>-->
+    <if test="null != superPerformId and '' != superPerformId">
+      and FIND_IN_SET(#{superPerformId},lp.parent_path)
     </if>
     ORDER BY lp.`SortId` ASC,lp.`PerformClassCode` ASC
   </select>
@@ -633,6 +642,8 @@
     SysLevel = #{record.syslevel,jdbcType=INTEGER},
     SupClassId = #{record.supclassid,jdbcType=VARCHAR},
     performName = #{record.performName,jdbcType=VARCHAR},
+        parent_path = #{record.parentPath,jdbcType=VARCHAR},
+        parent_name = #{record.parentName,jdbcType=VARCHAR},
     SupClassCode = #{record.supclasscode,jdbcType=VARCHAR},
     viewJurisdiction = #{record.viewJurisdiction,jdbcType=VARCHAR},
         WorkDivision = #{record.workdivision,jdbcType=VARCHAR},
@@ -724,6 +735,9 @@
   <select id="findUnit" resultMap="BaseResultMap">
     SELECT lp.* FROM ListPerform lp
     where (lp.PerformName = '' or lp.PerformName is null)
+    <if test="null != superPerformId and '' != superPerformId">
+      and FIND_IN_SET(#{superPerformId},lp.parent_path)
+    </if>
     ORDER BY lp.`SortId` ASC,lp.`PerformClassCode` ASC
   </select>
 

inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml

@@ -45,6 +45,9 @@
       <result column="CreatedOn" jdbcType="TIMESTAMP" property="createdon" />
       <result  column="SysUnitId" jdbcType="VARCHAR" property="sysUnitId"/>
       <result  column="member_type" jdbcType="INTEGER" property="memberType"/>
+      <result  column="area_code" jdbcType="INTEGER" property="areaCode"/>
+      <result  column="area_path" jdbcType="INTEGER" property="areaPath"/>
+      <result  column="area_name" jdbcType="INTEGER" property="areaName"/>
     </resultMap>
     <sql id="Example_Where_Clause">
       <where>
@@ -155,6 +158,9 @@
                            street_code,
                            community_code,
                            net_code,
+                           area_code,
+                           area_path,
+                           area_name,
                            supervise_area,
                            SysUnitOrEntId, SysDeptId,
         SysUnitOrEntName, SysDeptName, SysUserName,
@@ -172,6 +178,9 @@
         #{streetCode,jdbcType=VARCHAR},
         #{communityCode,jdbcType=VARCHAR},
         #{netCode,jdbcType=VARCHAR},
+        #{areaCode,jdbcType=VARCHAR},
+        #{areaPath,jdbcType=VARCHAR},
+        #{areaName,jdbcType=VARCHAR},
         #{superviseArea,jdbcType=VARCHAR},
               #{sysunitorentid,jdbcType=VARCHAR}, #{sysdeptid,jdbcType=VARCHAR},
         #{sysunitorentname,jdbcType=VARCHAR}, #{sysdeptname,jdbcType=VARCHAR}, #{sysusername,jdbcType=VARCHAR},
@@ -941,6 +950,9 @@
           street_code = #{record.streetCode,jdbcType=VARCHAR},
           community_code = #{record.communityCode,jdbcType=VARCHAR},
           net_code = #{record.netCode,jdbcType=VARCHAR},
+          area_code = #{record.areaCode,jdbcType=VARCHAR},
+          area_path = #{record.areaPath,jdbcType=VARCHAR},
+          area_name = #{record.areaName,jdbcType=VARCHAR},
           supervise_area = #{record.superviseArea,jdbcType=VARCHAR},
           SysUnitOrEntId = #{record.sysunitorentid,jdbcType=VARCHAR},
           SysDeptId = #{record.sysdeptid,jdbcType=VARCHAR},

inventory-gov/src/main/java/com/rzyc/controller/BaseController.java

@@ -2758,14 +2758,8 @@ public class BaseController {
     public String getUserArea(String userId)throws Exception{
         String areaCode = "";
         SysUser sysUser = sysUserMapper.findById(userId);
-        if(null != sysUser && StringUtils.isNotBlank(sysUser.getOrgcode())){
+        if(null != sysUser){
-            areaCode = sysUser.getOrgcode();
+            areaCode = sysUser.getAreaCode();
-            if(StringUtils.isNotBlank(sysUser.getStreetCode())){
-                areaCode = sysUser.getStreetCode();
-            }
-            if(StringUtils.isNotBlank(sysUser.getCommunityCode())){
-                areaCode = sysUser.getCommunityCode();
-            }
         }
         return areaCode;
     }

inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java

@@ -797,6 +797,30 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
         return result;
     }
 
+    /**
+     * 获取用户部门id
+     * @version v1.0
+     * @author dong
+     * @date 2022/12/8 15:00
+     */
+    private String getSuperPerformId(String userId)throws Exception{
+        String superPerformId = "";
+        if(StringUtils.isBlank(userId)){
+            userId = getUserId();
+        }
+        if(StringUtils.isNotBlank(userId)){
+            SysUser sysUser = sysUserMapper.findById(userId);
+            if(null != sysUser){
+                String performId = sysUser.getSystitle();
+                ListPerform perform = listPerformMapper.selectByPrimaryKey(performId);
+                if(null != perform){
+                    superPerformId = perform.getSupclassid();
+                }
+            }
+        }
+        return superPerformId;
+    }
+
     /**
      * 岗位树形列表
      * @return
@@ -807,7 +831,15 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
     @ResponseBody
     public MultiResult<ListPerform> performTree()throws Exception{
         MultiResult<ListPerform> result = new MultiResult<>();
-        List<ListPerform> listPerforms = listPerformMapper.findUnit();
+        String userId = getUserId();
+
+        if(StringUtils.isBlank(userId)){
+            userId = getUserId();
+        }
+        //获取部门id
+        String superPerformId = getSuperPerformId(userId);
+
+        List<ListPerform> listPerforms = listPerformMapper.findUnit(superPerformId);
         if(listPerforms.size() > 0){
             for(ListPerform listPerform : listPerforms){
                 if(StringUtils.isNotBlank(listPerform.getPerformName())){
@@ -909,6 +941,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
             user = sysUserMapper.findOtherUesr(sysUser.getSysusername(),sysUser.getSysuserid());
             if(null == user){
 
+                getUserAreaCode(changeUserDto.getAreaCode(),sysUser);
                 sysUserMapper.changeUser(sysUser);
                 //处理监管地区
                 changeSuperviseArea(sysUser.getSysuserid(),changeUserDto.getSuperviseAreaId(),operator.getChinaname());
@@ -924,6 +957,9 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
                 //密码
                 String passwd = PasswdFactory.encryptPasswd(sysUser.getSysuserid(), sysUser.getSysusername(), sysUser.getSyspassword());
                 sysUser.setSyspassword(passwd);
+
+                getUserAreaCode(changeUserDto.getAreaCode(),sysUser);
+
                 sysUserMapper.insert(sysUser);
                 //处理监管地区
                 changeSuperviseArea(sysUser.getSysuserid(),changeUserDto.getSuperviseAreaId(),operator.getChinaname());
@@ -935,6 +971,23 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
         return result;
     }
 
+    /**
+     * 处理企业地区信息
+     * @version v1.0
+     * @author dong
+     * @date 2022/11/1 14:40
+     */
+    public void getUserAreaCode(String areaCode,SysUser user)throws Exception{
+        if(StringUtils.isNotBlank(areaCode)){
+            SysOrg sysOrg = sysOrgMapper.selectById(areaCode);
+            if(null != sysOrg){
+                user.setAreaCode(areaCode);
+                user.setAreaPath(sysOrg.getParentPath());
+                user.setAreaName(sysOrg.getParentName());
+            }
+        }
+    }
+
     /**
      * 处理监管地区
      * @param userId
@@ -1404,14 +1457,13 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
         String condition = TypeConversion.getCondition(performPageDto.getCondition());
         String userId = performPageDto.getUserId();
         String performId = "";
-        if(StringUtils.isNotBlank(performPageDto.getUserId())){
+
-            SysUser sysUser = sysUserMapper.findById(userId);
+        if(StringUtils.isBlank(userId)){
-            if(null != sysUser){
+            userId = getUserId();
-                performId = sysUser.getSystitle();
-            }
         }
+        String superPerformId = getSuperPerformId(userId);
         PageHelper.startPage(performPageDto.getPage(), performPageDto.getPageSize());
-        Page<ListPerform> page = (Page<ListPerform>)listPerformMapper.performPage(performPageDto.getListperformid(),performId,condition);
+        Page<ListPerform> page = (Page<ListPerform>)listPerformMapper.performPage(performPageDto.getListperformid(),performId,condition,superPerformId);
         Pager<ListPerform> pager = new Pager<>();
         getDatePage(pager,page);
         result.setData(pager);
@@ -1442,6 +1494,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
 
         ListPerform perform = listPerformMapper.selectByPrimaryKey(listPerform.getListperformid());
         if(null != perform){
+            getPerformPath(listPerform.getSupclassid(),listPerform);
             //修改
             listPerformMapper.changeListPerform(listPerform);
         }else{
@@ -1453,6 +1506,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
                 performClassCode = GetSysOrganCode(perform);//生成
             }
             listPerform.setPerformclasscode(performClassCode);
+            getPerformPath(listPerform.getSupclassid(),listPerform);
             //新增
             listPerformMapper.insert(listPerform);
         }
@@ -1460,6 +1514,25 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
         return result;
     }
 
+    /**
+     *
+     * @version v1.0
+     * @author dong
+     * @date 2022/12/8 13:52
+     */
+    public void getPerformPath(String parentId,ListPerform perform)throws Exception{
+        perform.setParentPath(perform.getListperformid());
+        perform.setParentName(perform.getPerformclassname());
+        if(StringUtils.isNotBlank(parentId)){
+            ListPerform listPerform = listPerformMapper.selectByPrimaryKey(parentId);
+            if(null != listPerform){
+                perform.setParentPath(listPerform.getParentPath()+","+perform.getListperformid());
+                perform.setParentName(listPerform.getParentName()+","+perform.getPerformclassname());
+            }
+        }
+
+    }
+
     /**
      * 岗位安全生产职责清单
      * @param listperformId

inventory-gov/src/main/java/com/rzyc/controller/SettingController.java

@@ -889,6 +889,12 @@ public class SettingController extends BaseController{
      * @date 2022/11/1 14:20
      */
     public void handleAreaParent(String superiororgcod,SysOrg sysOrg)throws Exception{
+
+
+        sysOrg.setParentPath(sysOrg.getOrgcode());
+        sysOrg.setParentName(sysOrg.getOrgname());
+        sysOrg.setOrglevel(2);
+
         //计算地区等级
         if(StringUtils.isNotBlank(superiororgcod)){
             SysOrg superOrg = sysOrgMapper.selectById(superiororgcod);
@@ -899,10 +905,6 @@ public class SettingController extends BaseController{
                 sysOrg.setParentPath(superOrg.getParentPath()+","+sysOrg.getOrgcode());
                 sysOrg.setParentName(superOrg.getParentName()+","+sysOrg.getOrgname());
             }
-        }else{
-            sysOrg.setParentPath(sysOrg.getOrgcode());
-            sysOrg.setParentName(sysOrg.getOrgname());
-            sysOrg.setOrglevel(2);
         }
     }