From 61da16bfbaa3db5bafdb88f904f18cbfb566b3a4 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 12 Dec 2022 16:38:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=94=A8=E6=88=B7=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dao/SysUserDao.java | 2 + .../epdc/service/impl/SysUserServiceImpl.java | 111 +++++++++--------- .../src/main/resources/mapper/SysUserDao.xml | 11 ++ 3 files changed, 71 insertions(+), 53 deletions(-) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java index e579fbe..2a62eac 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java @@ -150,4 +150,6 @@ public interface SysUserDao extends BaseDao { * @since 2021/8/28 22:18 */ List selectListGridmanInfo(EpdcAppGridManFormDTO formDto); + + List getIsGridLeaderByUserId(@Param("userId") Long userId); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index 0ec910b..85ca34e 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -380,63 +380,68 @@ public class SysUserServiceImpl extends BaseServiceImpl result = communityManageFeignClient.addManageUser(userAddFormDTO); - log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserAdd result:" + result); - communityManageHandle(result, dto, entity); - } - } else if (type == NumConstant.ONE) { - SysUserEntity userEntity = baseDao.selectById(dto.getId()); - if (userEntity != null && userEntity.getManageId() != null) { - ManageUserUpdFormDTO userUpdFormDTO = new ManageUserUpdFormDTO(); - - userUpdFormDTO.setUserName(entity.getUsername()); - userUpdFormDTO.setGender(entity.getGender() == null ? "" : entity.getGender().toString()); - userUpdFormDTO.setBornTime(""); - userUpdFormDTO.setWorkDate(""); - userUpdFormDTO.setHeadImage(entity.getHeadUrl()); - userUpdFormDTO.setIntroduction(entity.getRemark()); - userUpdFormDTO.setDescription(""); - userUpdFormDTO.setId(userEntity.getManageId()); - userUpdFormDTO.setGridId(sysDeptInfoResultDTO.getGridManageId()); - - log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserUpdFormDTO:" + userUpdFormDTO); - Result result = communityManageFeignClient.updManageUser(userUpdFormDTO); - log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserupd result:" + result); - communityManageHandle(result, dto, entity); - } - } else if (type == NumConstant.TWO) { - SysUserEntity userEntity = baseDao.selectById(dto.getId()); - if (userEntity != null && userEntity.getManageId() != null) { - ManageUserDelFormDTO userDelFormDTO = new ManageUserDelFormDTO(); - userDelFormDTO.setId(userEntity.getManageId()); - log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserDelFormDTO:" + userDelFormDTO); - Result result = communityManageFeignClient.delManageUser(userDelFormDTO); - log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserDel result:" + result); + // 校验是否包含网格长角色 + List sysUserDTOS = baseDao.getIsGridLeaderByUserId(entity.getId()); + if(sysUserDTOS != null && sysUserDTOS.size() > 0){ + try { + // 获取网格的ManageId + SysDeptInfoResultDTO sysDeptInfoResultDTO = sysDeptInfoService.getSysDeptInfo(entity.getDeptId().toString()); + if (type == NumConstant.ZERO) { + if(sysDeptInfoResultDTO.getGridManageId() != null){ + ManageUserAddFormDTO userAddFormDTO = new ManageUserAddFormDTO(); + userAddFormDTO.setGridId(sysDeptInfoResultDTO.getGridManageId()); + userAddFormDTO.setUserName(entity.getUsername()); + userAddFormDTO.setPhone(entity.getMobile()); + userAddFormDTO.setGender(entity.getGender() == null ? "" : entity.getGender().toString()); + userAddFormDTO.setBornTime(""); + userAddFormDTO.setWorkDate(""); + userAddFormDTO.setHeadImage(entity.getHeadUrl()); + userAddFormDTO.setIntroduction(entity.getRemark()); + userAddFormDTO.setDescription(""); + userAddFormDTO.setCreateTime(entity.getCreateDate().toString()); + userAddFormDTO.setOldManageId(entity.getId().toString()); + + log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserAddFormDTO:" + userAddFormDTO); + Result result = communityManageFeignClient.addManageUser(userAddFormDTO); + log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserAdd result:" + result); + communityManageHandle(result, dto, entity); + } + } else if (type == NumConstant.ONE) { + SysUserEntity userEntity = baseDao.selectById(dto.getId()); + if (userEntity != null && userEntity.getManageId() != null) { + ManageUserUpdFormDTO userUpdFormDTO = new ManageUserUpdFormDTO(); + + userUpdFormDTO.setUserName(entity.getUsername()); + userUpdFormDTO.setGender(entity.getGender() == null ? "" : entity.getGender().toString()); + userUpdFormDTO.setBornTime(""); + userUpdFormDTO.setWorkDate(""); + userUpdFormDTO.setHeadImage(entity.getHeadUrl()); + userUpdFormDTO.setIntroduction(entity.getRemark()); + userUpdFormDTO.setDescription(""); + userUpdFormDTO.setId(userEntity.getManageId()); + userUpdFormDTO.setGridId(sysDeptInfoResultDTO.getGridManageId()); + + log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserUpdFormDTO:" + userUpdFormDTO); + Result result = communityManageFeignClient.updManageUser(userUpdFormDTO); + log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserupd result:" + result); + communityManageHandle(result, dto, entity); + } + } else if (type == NumConstant.TWO) { + SysUserEntity userEntity = baseDao.selectById(dto.getId()); + if (userEntity != null && userEntity.getManageId() != null) { + ManageUserDelFormDTO userDelFormDTO = new ManageUserDelFormDTO(); + userDelFormDTO.setId(userEntity.getManageId()); + log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserDelFormDTO:" + userDelFormDTO); + Result result = communityManageFeignClient.delManageUser(userDelFormDTO); + log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserDel result:" + result); // communityManageHandle(result, dto, entity); + } } + } catch (Exception e) { + log.error("推送社区管理接口失败：type>>" + type + "||id>>" + entity.getId()); } - } catch (Exception e) { - log.error("推送社区管理接口失败：type>>" + type + "||id>>" + entity.getId()); } + } /** diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml index f753290..9ac349f 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml @@ -235,4 +235,15 @@ eur.CREATED_TIME DESC LIMIT #{pageIndex}, #{pageSize} +