|
@ -207,19 +207,18 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit |
|
|
@Override |
|
|
@Override |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
public void delete(Long[] ids) { |
|
|
public void delete(Long[] ids) { |
|
|
//逻辑删除
|
|
|
|
|
|
logicDelete(ids, SysUserEntity.class); |
|
|
|
|
|
|
|
|
|
|
|
//角色用户关系,需要保留,不然逻辑删除就变成物理删除了
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SysUserEntity entity = new SysUserEntity(); |
|
|
SysUserEntity entity = new SysUserEntity(); |
|
|
SysUserDTO dto = new SysUserDTO(); |
|
|
SysUserDTO dto = new SysUserDTO(); |
|
|
entity.setId(ids[0]); |
|
|
entity.setId(ids[0]); |
|
|
dto.setId(ids[0]); |
|
|
dto.setId(ids[0]); |
|
|
// 社区管理推送
|
|
|
// 社区管理推送
|
|
|
sendInfo(dto, entity, 2); |
|
|
sendInfo(dto, entity, 2); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//逻辑删除
|
|
|
|
|
|
logicDelete(ids, SysUserEntity.class); |
|
|
|
|
|
|
|
|
|
|
|
//角色用户关系,需要保留,不然逻辑删除就变成物理删除了
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
@ -401,9 +400,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit |
|
|
userAddFormDTO.setCreateTime(DateUtils.format(entity.getCreateDate(), DateUtils.DATE_TIME_PATTERN)); |
|
|
userAddFormDTO.setCreateTime(DateUtils.format(entity.getCreateDate(), DateUtils.DATE_TIME_PATTERN)); |
|
|
userAddFormDTO.setOldManageId(entity.getId().toString()); |
|
|
userAddFormDTO.setOldManageId(entity.getId().toString()); |
|
|
|
|
|
|
|
|
log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserAddFormDTO:" + userAddFormDTO); |
|
|
|
|
|
Result<GlobalResultDTO> result = communityManageFeignClient.addManageUser(userAddFormDTO); |
|
|
Result<GlobalResultDTO> result = communityManageFeignClient.addManageUser(userAddFormDTO); |
|
|
log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserAdd result:" + JSON.toJSONString(result)); |
|
|
|
|
|
communityManageHandle(result, dto, entity); |
|
|
communityManageHandle(result, dto, entity); |
|
|
} |
|
|
} |
|
|
} else if (type == NumConstant.ONE) { |
|
|
} else if (type == NumConstant.ONE) { |
|
@ -418,9 +415,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit |
|
|
userUpdFormDTO.setId(userEntity.getManageId()); |
|
|
userUpdFormDTO.setId(userEntity.getManageId()); |
|
|
userUpdFormDTO.setGridId(sysDeptInfoResultDTO.getGridManageId()); |
|
|
userUpdFormDTO.setGridId(sysDeptInfoResultDTO.getGridManageId()); |
|
|
|
|
|
|
|
|
log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserUpdFormDTO:" + userUpdFormDTO); |
|
|
|
|
|
Result<GlobalResultDTO> result = communityManageFeignClient.updManageUser(userUpdFormDTO); |
|
|
Result<GlobalResultDTO> result = communityManageFeignClient.updManageUser(userUpdFormDTO); |
|
|
log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserupd result:" + JSON.toJSONString(result)); |
|
|
|
|
|
communityManageHandle(result, dto, entity); |
|
|
communityManageHandle(result, dto, entity); |
|
|
} |
|
|
} |
|
|
} else if (type == NumConstant.TWO) { |
|
|
} else if (type == NumConstant.TWO) { |
|
@ -428,9 +423,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit |
|
|
if (userEntity != null && userEntity.getManageId() != null) { |
|
|
if (userEntity != null && userEntity.getManageId() != null) { |
|
|
ManageUserDelFormDTO userDelFormDTO = new ManageUserDelFormDTO(); |
|
|
ManageUserDelFormDTO userDelFormDTO = new ManageUserDelFormDTO(); |
|
|
userDelFormDTO.setId(userEntity.getManageId()); |
|
|
userDelFormDTO.setId(userEntity.getManageId()); |
|
|
log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserDelFormDTO:" + userDelFormDTO); |
|
|
|
|
|
Result<GlobalResultDTO> result = communityManageFeignClient.delManageUser(userDelFormDTO); |
|
|
Result<GlobalResultDTO> result = communityManageFeignClient.delManageUser(userDelFormDTO); |
|
|
log.info("++++++++++++++++++++++++++++++++++++++++++++sysUserDel result:" + JSON.toJSONString(result)); |
|
|
|
|
|
// communityManageHandle(result, dto, entity);
|
|
|
// communityManageHandle(result, dto, entity);
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -448,7 +441,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit |
|
|
* @param entity |
|
|
* @param entity |
|
|
*/ |
|
|
*/ |
|
|
private void communityManageHandle(Result<GlobalResultDTO> result, SysUserDTO dto, SysUserEntity entity) { |
|
|
private void communityManageHandle(Result<GlobalResultDTO> result, SysUserDTO dto, SysUserEntity entity) { |
|
|
log.info("++++++++++++++++++++++++++++++++++++++++++++进入设置【设置ManageId】"); |
|
|
|
|
|
if (result.success()) { |
|
|
if (result.success()) { |
|
|
Object resultObject = result.getData().getResult(); |
|
|
Object resultObject = result.getData().getResult(); |
|
|
Integer mId = null; |
|
|
Integer mId = null; |
|
@ -456,7 +448,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit |
|
|
if (resultObject != null) { |
|
|
if (resultObject != null) { |
|
|
mId = Integer.valueOf(resultObject.toString()); |
|
|
mId = Integer.valueOf(resultObject.toString()); |
|
|
} |
|
|
} |
|
|
log.info("++++++++++++++++++++++++++++++++++++++++++++进入设置【设置ManageId】++++ mId: " + mId); |
|
|
|
|
|
SysUserEntity userEntity = baseDao.selectById(entity.getId()); |
|
|
SysUserEntity userEntity = baseDao.selectById(entity.getId()); |
|
|
// 表里没有直接插入
|
|
|
// 表里没有直接插入
|
|
|
if (userEntity == null) { |
|
|
if (userEntity == null) { |
|
|