PC端用户管理修改支持关联多个部门

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java

@@ -110,13 +110,23 @@ public class SysUserDTO implements Serializable {
     private String scrip;
 
     /**
-     * 关联部门ID
+     * 关联工作人员部门ID
      */
-    private Long relationDeptId;
+    private Long relationWorkDeptId;
 
     /**
-     * 关联部门名称
+     * 关联工作人员部门名称
      */
-    private String relationDeptName;
+    private String relationWorkDeptName;
+
+    /**
+     * 关联领导干部部门ID
+     */
+    private Long relationLeaderDeptId;
+
+    /**
+     * 关联领导干部部门名称
+     */
+    private String relationLeaderDeptName;
 
 }

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDeptDTO.java

@@ -44,9 +44,14 @@ public class SysUserDeptDTO implements Serializable {
 	private Long userId;
 
     /**
-     * 部门ID
+     * 关联工作人员网格ID
      */
-	private Long deptId;
+    private Long relationWorkDeptId;
+
+    /**
+     * 关联领导干部网格ID
+     */
+    private Long relationLeaderDeptId;
 
     /**
      * 删除标识  0：未删除    1：删除

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDeptInfoDTO.java

@@ -14,12 +14,22 @@ public class SysUserDeptInfoDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 关联部门ID
+     * 关联工作人员网格ID
      */
-    private Long relationDeptId;
+    private Long relationWorkDeptId;
 
     /**
-     * 关联部门名称
+     * 关联工作人员网格名称
      */
-    private String relationDeptName;
+    private String relationWorkDeptName;
+
+    /**
+     * 关联领导干部网格ID
+     */
+    private Long relationLeaderDeptId;
+
+    /**
+     * 关联领导干部网格名称
+     */
+    private String relationLeaderDeptName;
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserDeptEntity.java

@@ -47,9 +47,14 @@ public class SysUserDeptEntity extends BaseEntity {
 	private Long userId;
 
 	/**
-     * 部门ID
+	 * 关联工作人员网格ID
 	 */
-	private Long deptId;
+	private Long relationWorkDeptId;
+
+	/**
+	 * 关联领导干部网格ID
+	 */
+	private Long relationLeaderDeptId;
 
 	/**
 	 * 删除标识  0：未删除    1：删除

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserDeptService.java

@@ -104,7 +104,7 @@ public interface SysUserDeptService extends BaseService<SysUserDeptEntity> {
      * @author liuchuang
      * @since 2020/7/29 15:56
      */
-    void saveOrUpdateUserDeptInfo(Long userId, Long deptId);
+    void saveOrUpdateUserDeptInfo(Long userId, Long relationWorkDeptId, Long relationLeaderDeptId);
 
     /**
      *

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserDeptServiceImpl.java

@@ -28,7 +28,6 @@ import com.elink.esua.epdc.dao.SysUserDeptDao;
 import com.elink.esua.epdc.dto.SysUserDeptDTO;
 import com.elink.esua.epdc.dto.SysUserDeptInfoDTO;
 import com.elink.esua.epdc.entity.SysUserDeptEntity;
-import com.elink.esua.epdc.entity.SysUserEntity;
 import com.elink.esua.epdc.redis.SysUserDeptRedis;
 import com.elink.esua.epdc.service.SysUserDeptService;
 import org.apache.commons.lang3.StringUtils;
@@ -106,25 +105,29 @@ public class SysUserDeptServiceImpl extends BaseServiceImpl<SysUserDeptDao, SysU
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveOrUpdateUserDeptInfo(Long userId, Long deptId) {
+    public void saveOrUpdateUserDeptInfo(Long userId, Long relationWorkDeptId, Long relationLeaderDeptId) {
-        if (null != userId && null != deptId) {
+        if (null != userId) {
             QueryWrapper<SysUserDeptEntity> wrapper = new QueryWrapper<>();
             wrapper.eq(FieldConstant.USER_ID, userId)
                     .eq(FieldConstant.DEL_FLAG, DelFlagEnum.NORMAL.value());
             SysUserDeptEntity userDeptEntity = baseDao.selectOne(wrapper);
-
             if (null != userDeptEntity) {
                 userDeptEntity.setUserId(userId);
-                userDeptEntity.setDeptId(deptId);
+                userDeptEntity.setRelationWorkDeptId(relationWorkDeptId);
+                userDeptEntity.setRelationLeaderDeptId(relationLeaderDeptId);
                 updateById(userDeptEntity);
+                baseDao.updateRelationDeptInfoByUserId(userId, relationWorkDeptId, relationLeaderDeptId);
             } else {
+                if (null != relationWorkDeptId || null != relationLeaderDeptId) {
                     SysUserDeptEntity entity = new SysUserDeptEntity();
                     entity.setUserId(userId);
-                entity.setDeptId(deptId);
+                    entity.setRelationWorkDeptId(relationWorkDeptId);
+                    entity.setRelationLeaderDeptId(relationLeaderDeptId);
                     insert(entity);
                 }
             }
         }
+    }
 
     @Override
     public SysUserDeptInfoDTO getUserDeptInfoByUserId(Long userId) {

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@@ -105,8 +105,10 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         // 获取用户关联部门信息
         SysUserDeptInfoDTO sysUserDeptInfoDto = sysUserDeptService.getUserDeptInfoByUserId(id);
         if (null != sysUserDeptInfoDto) {
-            dto.setRelationDeptId(sysUserDeptInfoDto.getRelationDeptId());
+            dto.setRelationWorkDeptId(sysUserDeptInfoDto.getRelationWorkDeptId());
-            dto.setRelationDeptName(sysUserDeptInfoDto.getRelationDeptName());
+            dto.setRelationWorkDeptName(sysUserDeptInfoDto.getRelationWorkDeptName());
+            dto.setRelationLeaderDeptId(sysUserDeptInfoDto.getRelationLeaderDeptId());
+            dto.setRelationLeaderDeptName(sysUserDeptInfoDto.getRelationLeaderDeptName());
         }
 
         return dto;
@@ -138,7 +140,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         sysRoleUserService.saveOrUpdate(entity.getId(), dto.getRoleIdList());
 
         // 保存/更新用户关联部门信息
-        sysUserDeptService.saveOrUpdateUserDeptInfo(entity.getId(), dto.getRelationDeptId());
+        sysUserDeptService.saveOrUpdateUserDeptInfo(entity.getId(), dto.getRelationWorkDeptId(), dto.getRelationLeaderDeptId());
 
     }
 
@@ -165,7 +167,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         sysRoleUserService.saveOrUpdate(entity.getId(), dto.getRoleIdList());
 
         // 保存/更新用户关联部门信息
-        sysUserDeptService.saveOrUpdateUserDeptInfo(entity.getId(), dto.getRelationDeptId());
+        sysUserDeptService.saveOrUpdateUserDeptInfo(entity.getId(), dto.getRelationWorkDeptId(), dto.getRelationLeaderDeptId());
     }
 
     /**

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml

@@ -178,7 +178,7 @@
            u.scrip
         from sys_user u
 	      LEFT JOIN sys_user_dept ud ON u.id = ud.user_id AND ud.del_flag = '0'
-        where u.del_flag='0' and ud.dept_id=#{gridId} and u.mobile = #{mobile}
+        where u.del_flag='0' and (ud.relation_work_dept_id=#{gridId} OR ud.relation_work_dept_id=#{gridId}) and u.mobile = #{mobile}
         order by u.CREATE_DATE desc
         limit 1
     </select>

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDeptDao.xml

@@ -3,28 +3,25 @@
 
 <mapper namespace="com.elink.esua.epdc.dao.SysUserDeptDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.SysUserDeptEntity" id="sysUserDeptMap">
-        <result property="id" column="id"/>
-        <result property="userId" column="user_id"/>
-        <result property="deptId" column="dept_id"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="creator" column="creator"/>
-        <result property="createDate" column="create_date"/>
-        <result property="updater" column="updater"/>
-        <result property="updateDate" column="update_date"/>
-    </resultMap>
-
     <select id="selectUserDeptInfoByUserId" resultType="com.elink.esua.epdc.dto.SysUserDeptInfoDTO">
         SELECT
-            d.id relationDeptId,
+            d.id relationWorkDeptId,
-            d.`name` relationDeptName
+            d.`name` relationWorkDeptName,
+            d1.id relationLeaderDeptId,
+            d1.`name` relationLeaderDeptName
         FROM
             sys_user_dept ud
-            LEFT JOIN sys_dept d ON d.id = ud.dept_id
+            LEFT JOIN sys_dept d ON d.id = ud.relation_work_dept_id
             AND d.del_flag = 0
+            LEFT JOIN sys_dept d1 ON d1.id = ud.relation_leader_dept_id
+            AND d1.del_flag = 0
         WHERE
             ud.del_flag = 0
             AND ud.user_id = #{userId}
     </select>
 
+    <update id="updateRelationDeptInfoByUserId">
+        UPDATE sys_user_dept SET relation_work_dept_id = #{relationWorkDeptId}, relation_leader_dept_id = #{relationLeaderDeptId} WHERE user_id = #{userId}
+    </update>
+
 </mapper>