|
|
|
@ -80,6 +80,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit |
|
|
|
private CustomerStaffDepartmentDao customerStaffDepartmentDao; |
|
|
|
@Resource |
|
|
|
private CustomerStaffGridDao customerStaffGridDao; |
|
|
|
@Resource |
|
|
|
private SysDictDao sysDictDao; |
|
|
|
@Resource |
|
|
|
private UserDao userDao; |
|
|
|
@Resource |
|
|
|
private CustomerStaffDao customerStaffDao; |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageData<SysUserDTO> page(Map<String, Object> params) { |
|
|
|
@ -150,6 +156,27 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit |
|
|
|
entity.setSuperAdmin(SuperAdminEnum.NO.value()); |
|
|
|
insert(entity); |
|
|
|
|
|
|
|
//查询字典获取customer_id
|
|
|
|
SysDictEntity sysDictEntity = sysDictDao.selectDcp(); |
|
|
|
//同步customer_staff,user
|
|
|
|
UserEntity userEntity = new UserEntity(); |
|
|
|
userEntity.setId(entity.getId().toString()); |
|
|
|
userEntity.setCustomerId(sysDictEntity.getDictValue()); |
|
|
|
userEntity.setFromApp("gov"); |
|
|
|
userEntity.setFromClient("web"); |
|
|
|
userDao.insert(userEntity); |
|
|
|
if (entity.getUserTagKey().equals("offers")) { |
|
|
|
CustomerStaffEntity customerStaffEntity = ConvertUtils.sourceToTarget(entity, CustomerStaffEntity.class); |
|
|
|
customerStaffEntity.setCustomerId(sysDictEntity.getDictValue()); |
|
|
|
customerStaffEntity.setUserId(userEntity.getId()); |
|
|
|
customerStaffEntity.setHeadPhoto(entity.getHeadUrl()); |
|
|
|
customerStaffEntity.setWorkType("fulltime"); |
|
|
|
customerStaffEntity.setActiveFlag("active"); |
|
|
|
customerStaffEntity.setActiveTime(new Date()); |
|
|
|
customerStaffEntity.setEnableFlag("enable"); |
|
|
|
customerStaffDao.insert(customerStaffEntity); |
|
|
|
} |
|
|
|
|
|
|
|
//更新组织totalUser,同步org 三张表
|
|
|
|
SysDeptEntity deptEntity = sysDeptDao.select(dto.getDeptId()); |
|
|
|
if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) { |
|
|
|
@ -198,6 +225,21 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit |
|
|
|
|
|
|
|
//更新用户
|
|
|
|
updateById(entity); |
|
|
|
//更新customer_staff
|
|
|
|
if (dto.getUserTagKey().equals("offers")) { |
|
|
|
QueryWrapper<CustomerStaffEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
queryWrapper.eq("USER_ID", dto.getId().toString()); |
|
|
|
CustomerStaffEntity customerStaffEntity = customerStaffDao.selectOne(queryWrapper); |
|
|
|
customerStaffEntity.setRealName(dto.getRealName()); |
|
|
|
customerStaffEntity.setGender(dto.getGender()); |
|
|
|
customerStaffEntity.setEmail(dto.getEmail()); |
|
|
|
customerStaffEntity.setMobile(dto.getMobile()); |
|
|
|
if (StringUtils.isNotEmpty(dto.getPassword())) { |
|
|
|
customerStaffEntity.setPassword(PasswordUtils.encode(dto.getPassword())); |
|
|
|
} |
|
|
|
customerStaffEntity.setHeadPhoto(dto.getHeadUrl()); |
|
|
|
customerStaffDao.updateById(customerStaffEntity); |
|
|
|
} |
|
|
|
|
|
|
|
if (!sysUserEntity.getDeptId().equals(entity.getDeptId())) { |
|
|
|
//更新后用户的机构信息
|
|
|
|
@ -274,54 +316,60 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit |
|
|
|
//更新角色用户关系
|
|
|
|
sysRoleUserService.saveOrUpdate(entity.getId(), dto.getRoleIdList()); |
|
|
|
} |
|
|
|
private void updateAgencyTotalUserAfter(SysDeptEntity deptEntity){ |
|
|
|
|
|
|
|
private void updateAgencyTotalUserAfter(SysDeptEntity deptEntity) { |
|
|
|
CustomerAgencyEntity customerAgencyEntity = customerAgencyDao.selectById(deptEntity.getId().toString()); |
|
|
|
customerAgencyEntity.setTotalUser(customerAgencyEntity.getTotalUser()+1); |
|
|
|
customerAgencyEntity.setTotalUser(customerAgencyEntity.getTotalUser() + 1); |
|
|
|
customerAgencyDao.updateById(customerAgencyEntity); |
|
|
|
} |
|
|
|
private void updateDepartmentTotalUserAfter(SysDeptEntity deptEntity){ |
|
|
|
|
|
|
|
private void updateDepartmentTotalUserAfter(SysDeptEntity deptEntity) { |
|
|
|
CustomerDepartmentEntity customerDepartmentEntity = customerDepartmentDao.selectById(deptEntity.getId().toString()); |
|
|
|
customerDepartmentEntity.setTotalUser(customerDepartmentEntity.getTotalUser()+1); |
|
|
|
customerDepartmentEntity.setTotalUser(customerDepartmentEntity.getTotalUser() + 1); |
|
|
|
customerDepartmentDao.updateById(customerDepartmentEntity); |
|
|
|
} |
|
|
|
private void updateAgencyTotalUserBefore(SysDeptEntity sysDeptEntity){ |
|
|
|
|
|
|
|
private void updateAgencyTotalUserBefore(SysDeptEntity sysDeptEntity) { |
|
|
|
CustomerAgencyEntity customerAgencyEntity = customerAgencyDao.selectById(sysDeptEntity.getId().toString()); |
|
|
|
customerAgencyEntity.setTotalUser(customerAgencyEntity.getTotalUser()-1); |
|
|
|
customerAgencyEntity.setTotalUser(customerAgencyEntity.getTotalUser() - 1); |
|
|
|
customerAgencyDao.updateById(customerAgencyEntity); |
|
|
|
} |
|
|
|
private void updateDepartmentTotalUserBefore(SysDeptEntity sysDeptEntity){ |
|
|
|
|
|
|
|
private void updateDepartmentTotalUserBefore(SysDeptEntity sysDeptEntity) { |
|
|
|
CustomerDepartmentEntity customerDepartmentEntity = customerDepartmentDao.selectById(sysDeptEntity.getId().toString()); |
|
|
|
customerDepartmentEntity.setTotalUser(customerDepartmentEntity.getTotalUser()-1); |
|
|
|
customerDepartmentEntity.setTotalUser(customerDepartmentEntity.getTotalUser() - 1); |
|
|
|
customerDepartmentDao.updateById(customerDepartmentEntity); |
|
|
|
} |
|
|
|
private void updateGridTotalUserBefore(SysDeptEntity sysDeptEntity){ |
|
|
|
|
|
|
|
private void updateGridTotalUserBefore(SysDeptEntity sysDeptEntity) { |
|
|
|
CustomerGridEntity customerGridEntityBefore = customerGridDao.selectById(sysDeptEntity.getId().toString()); |
|
|
|
customerGridEntityBefore.setTotalUser(customerGridEntityBefore.getTotalUser()-1); |
|
|
|
customerGridEntityBefore.setTotalUser(customerGridEntityBefore.getTotalUser() - 1); |
|
|
|
customerGridDao.updateById(customerGridEntityBefore); |
|
|
|
} |
|
|
|
private void updateGridTotalUserAfter(SysDeptEntity deptEntity){ |
|
|
|
|
|
|
|
private void updateGridTotalUserAfter(SysDeptEntity deptEntity) { |
|
|
|
CustomerGridEntity customerGridEntityAfter = customerGridDao.selectById(deptEntity.getId().toString()); |
|
|
|
customerGridEntityAfter.setTotalUser(customerGridEntityAfter.getTotalUser()+1); |
|
|
|
customerGridEntityAfter.setTotalUser(customerGridEntityAfter.getTotalUser() + 1); |
|
|
|
customerGridDao.updateById(customerGridEntityAfter); |
|
|
|
} |
|
|
|
|
|
|
|
private void packageGrid(SysUserEntity entity, CustomerStaffGridEntity gridEntity) { |
|
|
|
gridEntity.setId(entity.getId().toString()); |
|
|
|
gridEntity.setCustomerId("bb19419e365cf97567dc0520cdcfba9e"); |
|
|
|
gridEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1"); |
|
|
|
gridEntity.setUserId(entity.getId().toString()); |
|
|
|
gridEntity.setGridId(entity.getDeptId().toString()); |
|
|
|
} |
|
|
|
|
|
|
|
private void packageDepartment(SysUserEntity entity, CustomerStaffDepartmentEntity departmentEntity) { |
|
|
|
departmentEntity.setId(entity.getId().toString()); |
|
|
|
departmentEntity.setCustomerId("bb19419e365cf97567dc0520cdcfba9e"); |
|
|
|
departmentEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1"); |
|
|
|
departmentEntity.setUserId(entity.getId().toString()); |
|
|
|
departmentEntity.setDepartmentId(entity.getDeptId().toString()); |
|
|
|
} |
|
|
|
|
|
|
|
private void packageAgency(SysUserEntity entity, CustomerStaffAgencyEntity agencyEntity) { |
|
|
|
agencyEntity.setId(entity.getId().toString()); |
|
|
|
agencyEntity.setCustomerId("bb19419e365cf97567dc0520cdcfba9e"); |
|
|
|
agencyEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1"); |
|
|
|
agencyEntity.setUserId(entity.getId().toString()); |
|
|
|
agencyEntity.setAgencyId(entity.getDeptId().toString()); |
|
|
|
} |
|
|
|
@ -355,7 +403,11 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit |
|
|
|
|
|
|
|
//角色用户关系，需要保留，不然逻辑删除就变成物理删除了
|
|
|
|
|
|
|
|
//逻辑删除组织用户
|
|
|
|
//逻辑删除user,customer_staff
|
|
|
|
List<String> idLists = Arrays.asList(ids).stream().map(x -> x.toString()).collect(Collectors.toList()); |
|
|
|
userDao.deleteBatchIds(idLists); |
|
|
|
customerStaffDao.deleteBatchUserIds(idLists); |
|
|
|
//物理删除组织用户
|
|
|
|
List<SysUserEntity> sysUserEntities = baseDao.selectBatchIds(Arrays.asList(ids)); |
|
|
|
List<String> deptIds = sysUserEntities.stream().map(x -> x.getDeptId().toString()).collect(Collectors.toList()); |
|
|
|
List<SysDeptEntity> sysDeptEntities = sysDeptDao.selectBatchIds(deptIds); |
|
|
|
@ -389,7 +441,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit |
|
|
|
}); |
|
|
|
} |
|
|
|
}); |
|
|
|
//批量逻辑删除组织用户, 批量更新组织部门totalUser
|
|
|
|
//批量物理删除组织用户, 批量更新组织部门totalUser
|
|
|
|
if (CollectionUtils.isNotEmpty(agencyIds)) { |
|
|
|
baseDao.deleteAgencyBatchIds(agencyIds); |
|
|
|
baseDao.updateTotalUserAgencyBatch(customerAgencyIds); |
|
|
|
|
mkh
4 years ago