From 8ea2043bed0ccf549a80ebbf3c9039d0e09c26a4 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Fri, 18 Dec 2020 11:10:38 +0800 Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E6=8C=81=E5=85=B3=E8=81=94=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/SysUserDTO.java | 18 ++++++++++--- .../elink/esua/epdc/dto/SysUserDeptDTO.java | 11 +++++--- .../esua/epdc/dto/SysUserDeptInfoDTO.java | 18 ++++++++++--- .../esua/epdc/entity/SysUserDeptEntity.java | 15 +++++++---- .../esua/epdc/service/SysUserDeptService.java | 4 +-- .../service/impl/SysUserDeptServiceImpl.java | 23 +++++++++------- .../epdc/service/impl/SysUserServiceImpl.java | 10 ++++--- .../src/main/resources/mapper/SysUserDao.xml | 2 +- .../main/resources/mapper/SysUserDeptDao.xml | 27 +++++++++---------- 9 files changed, 80 insertions(+), 48 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java index ac93d49a..e8aa6d35 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDeptDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDeptDTO.java index 86ca3d16..9779ed79 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDeptDTO.java +++ b/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：删除 @@ -73,4 +78,4 @@ public class SysUserDeptDTO implements Serializable { */ private Date updateDate; -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDeptInfoDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDeptInfoDTO.java index 4580c6cd..9aaa1d32 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDeptInfoDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserDeptEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserDeptEntity.java index a9fcc905..66f3ed0b 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserDeptEntity.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserDeptEntity.java @@ -46,10 +46,15 @@ public class SysUserDeptEntity extends BaseEntity { */ private Long userId; - /** - * 部门ID - */ - private Long deptId; + /** + * 关联工作人员网格ID + */ + private Long relationWorkDeptId; + + /** + * 关联领导干部网格ID + */ + private Long relationLeaderDeptId; /** * 删除标识 0：未删除 1：删除 @@ -70,4 +75,4 @@ public class SysUserDeptEntity extends BaseEntity { @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateDate; -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserDeptService.java index e8e3893c..2da1b16f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserDeptService.java +++ b/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 { * @author liuchuang * @since 2020/7/29 15:56 */ - void saveOrUpdateUserDeptInfo(Long userId, Long deptId); + void saveOrUpdateUserDeptInfo(Long userId, Long relationWorkDeptId, Long relationLeaderDeptId); /** * @@ -116,4 +116,4 @@ public interface SysUserDeptService extends BaseService { * @since 2020/7/29 16:19 */ SysUserDeptInfoDTO getUserDeptInfoByUserId(Long userId); -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserDeptServiceImpl.java index 62766c59..4464617c 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserDeptServiceImpl.java +++ b/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,22 +105,26 @@ public class SysUserDeptServiceImpl extends BaseServiceImpl 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 { - SysUserDeptEntity entity = new SysUserDeptEntity(); - entity.setUserId(userId); - entity.setDeptId(deptId); - insert(entity); + if (null != relationWorkDeptId || null != relationLeaderDeptId) { + SysUserDeptEntity entity = new SysUserDeptEntity(); + entity.setUserId(userId); + entity.setRelationWorkDeptId(relationWorkDeptId); + entity.setRelationLeaderDeptId(relationLeaderDeptId); + insert(entity); + } } } } @@ -131,4 +134,4 @@ public class SysUserDeptServiceImpl extends BaseServiceImpl diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDeptDao.xml index aad161b3..60cd9f7a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDeptDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDeptDao.xml @@ -3,28 +3,25 @@ - - - - - - - - - - - - \ No newline at end of file + + UPDATE sys_user_dept SET relation_work_dept_id = #{relationWorkDeptId}, relation_leader_dept_id = #{relationLeaderDeptId} WHERE user_id = #{userId} + + +