|
@@ -97,19 +97,19 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
@Transactional
|
|
@Transactional
|
|
- public String createPerson(AddPersonDTO addPersonDTO) {
|
|
|
|
- checkAddPersonDTO(addPersonDTO);
|
|
|
|
|
|
+ public String createPerson(AddPerson4FrontEndDTO addPerson4FrontEndDTO) {
|
|
|
|
+ checkAddPersonDTO(addPerson4FrontEndDTO);
|
|
// 创建账号
|
|
// 创建账号
|
|
- String accountId = createAccount(addPersonDTO);
|
|
|
|
|
|
+ String accountId = createAccount(addPerson4FrontEndDTO);
|
|
// 保存人员
|
|
// 保存人员
|
|
- Person person = savePerson(addPersonDTO, accountId);
|
|
|
|
|
|
+ Person person = savePerson(addPerson4FrontEndDTO, accountId);
|
|
// 创建人员工作信息
|
|
// 创建人员工作信息
|
|
- saveWorkResumes(addPersonDTO, person.getId());
|
|
|
|
|
|
+ saveWorkResumes(addPerson4FrontEndDTO, person.getId());
|
|
// 账号关联项目
|
|
// 账号关联项目
|
|
- saveAccountProject(accountId, addPersonDTO.getProjects());
|
|
|
|
|
|
+ saveAccountProject(accountId, addPerson4FrontEndDTO.getProjects());
|
|
// 账号关联角色
|
|
// 账号关联角色
|
|
- saveAccountRole(accountId, addPersonDTO.getMainDuty(),
|
|
|
|
- addPersonDTO.getOtherDuties(), addPersonDTO.getOtherRoles());
|
|
|
|
|
|
+ saveAccountRole(accountId, addPerson4FrontEndDTO.getMainDuty(),
|
|
|
|
+ addPerson4FrontEndDTO.getOtherDuties(), addPerson4FrontEndDTO.getOtherRoles());
|
|
return person.getId();
|
|
return person.getId();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -187,13 +187,13 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
/**
|
|
/**
|
|
* 保存人员的工作信息
|
|
* 保存人员的工作信息
|
|
*
|
|
*
|
|
- * @param addPersonDTO 创建人员入参
|
|
|
|
- * @param personId 人员id
|
|
|
|
|
|
+ * @param addPerson4FrontEndDTO 创建人员入参
|
|
|
|
+ * @param personId 人员id
|
|
* @author lixing
|
|
* @author lixing
|
|
* @version V1.0 2021/3/23 4:23 下午
|
|
* @version V1.0 2021/3/23 4:23 下午
|
|
*/
|
|
*/
|
|
- private void saveWorkResumes(AddPersonDTO addPersonDTO, String personId) {
|
|
|
|
- List<String> depIds = addPersonDTO.getDepIds();
|
|
|
|
|
|
+ private void saveWorkResumes(AddPerson4FrontEndDTO addPerson4FrontEndDTO, String personId) {
|
|
|
|
+ List<String> depIds = addPerson4FrontEndDTO.getDepIds();
|
|
for (String depId : depIds) {
|
|
for (String depId : depIds) {
|
|
AddWorkResumeDTO addWorkResumeDTO = new AddWorkResumeDTO();
|
|
AddWorkResumeDTO addWorkResumeDTO = new AddWorkResumeDTO();
|
|
addWorkResumeDTO.setPersonId(personId);
|
|
addWorkResumeDTO.setPersonId(personId);
|
|
@@ -205,18 +205,18 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
/**
|
|
/**
|
|
* 保存人员信息到数据库
|
|
* 保存人员信息到数据库
|
|
*
|
|
*
|
|
- * @param addPersonDTO 创建人员入参
|
|
|
|
- * @param accountId 账号id
|
|
|
|
|
|
+ * @param addPerson4FrontEndDTO 创建人员入参
|
|
|
|
+ * @param accountId 账号id
|
|
* @return 保存后的人员对象
|
|
* @return 保存后的人员对象
|
|
* @author lixing
|
|
* @author lixing
|
|
* @version V1.0 2021/3/23 4:06 下午
|
|
* @version V1.0 2021/3/23 4:06 下午
|
|
*/
|
|
*/
|
|
- private Person savePerson(AddPersonDTO addPersonDTO, String accountId) {
|
|
|
|
- Person person = ConvertPersonTool.INSTANCE.convertAddDto2Entity(addPersonDTO);
|
|
|
|
|
|
+ private Person savePerson(AddPerson4FrontEndDTO addPerson4FrontEndDTO, String accountId) {
|
|
|
|
+ Person person = ConvertPersonTool.INSTANCE.convertAddDto2Entity(addPerson4FrontEndDTO);
|
|
person.setNamePinyin(PinyinUtil.getPinyin(person.getName(), ""));
|
|
person.setNamePinyin(PinyinUtil.getPinyin(person.getName(), ""));
|
|
person.setAccountId(accountId);
|
|
person.setAccountId(accountId);
|
|
- if (!CollectionUtils.isEmpty(addPersonDTO.getProfessions())) {
|
|
|
|
- person.setProfession(String.join(",", addPersonDTO.getProfessions()));
|
|
|
|
|
|
+ if (!CollectionUtils.isEmpty(addPerson4FrontEndDTO.getProfessions())) {
|
|
|
|
+ person.setProfession(String.join(",", addPerson4FrontEndDTO.getProfessions()));
|
|
}
|
|
}
|
|
// 设置默认值
|
|
// 设置默认值
|
|
personServiceTool.setDefaultValue(person);
|
|
personServiceTool.setDefaultValue(person);
|
|
@@ -227,14 +227,14 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
/**
|
|
/**
|
|
* 创建账号
|
|
* 创建账号
|
|
*
|
|
*
|
|
- * @param addPersonDTO 创建人员入参
|
|
|
|
|
|
+ * @param addPerson4FrontEndDTO 创建人员入参
|
|
* @return 账号id
|
|
* @return 账号id
|
|
* @author lixing
|
|
* @author lixing
|
|
* @version V1.0 2021/3/23 3:42 下午
|
|
* @version V1.0 2021/3/23 3:42 下午
|
|
*/
|
|
*/
|
|
- private String createAccount(AddPersonDTO addPersonDTO) {
|
|
|
|
- AddSaasAccountDTO addSaasAccountDTO = ConvertPersonTool.INSTANCE.convert2AddSaasAccountDTO(addPersonDTO);
|
|
|
|
- addSaasAccountDTO.setValidLast(getAccountExpireType(addPersonDTO.getExpireDate()));
|
|
|
|
|
|
+ private String createAccount(AddPerson4FrontEndDTO addPerson4FrontEndDTO) {
|
|
|
|
+ AddSaasAccountDTO addSaasAccountDTO = ConvertPersonTool.INSTANCE.convert2AddSaasAccountDTO(addPerson4FrontEndDTO);
|
|
|
|
+ addSaasAccountDTO.setValidLast(getAccountExpireType(addPerson4FrontEndDTO.getExpireDate()));
|
|
return saasAccountService.createSaasAccount(addSaasAccountDTO);
|
|
return saasAccountService.createSaasAccount(addSaasAccountDTO);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -307,29 +307,29 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
/**
|
|
/**
|
|
* 校验重复项
|
|
* 校验重复项
|
|
*
|
|
*
|
|
- * @param addPersonDTO 创建人员入参
|
|
|
|
|
|
+ * @param addPerson4FrontEndDTO 创建人员入参
|
|
* @author lixing
|
|
* @author lixing
|
|
* @version V1.0 2021/3/22 9:53 上午
|
|
* @version V1.0 2021/3/22 9:53 上午
|
|
*/
|
|
*/
|
|
- private void checkAddPersonDTO(AddPersonDTO addPersonDTO) {
|
|
|
|
|
|
+ private void checkAddPersonDTO(AddPerson4FrontEndDTO addPerson4FrontEndDTO) {
|
|
// 校验身份证号
|
|
// 校验身份证号
|
|
- if (checkDuplicateIdNumber(addPersonDTO.getIdNumber())) {
|
|
|
|
|
|
+ if (checkDuplicateIdNumber(addPerson4FrontEndDTO.getIdNumber())) {
|
|
throw new IllegalArgumentException("身份证号重复");
|
|
throw new IllegalArgumentException("身份证号重复");
|
|
}
|
|
}
|
|
// 校验账号
|
|
// 校验账号
|
|
- if (checkDuplicateUserName(addPersonDTO.getUsername())) {
|
|
|
|
|
|
+ if (checkDuplicateUserName(addPerson4FrontEndDTO.getUsername())) {
|
|
throw new IllegalArgumentException("账号已被使用");
|
|
throw new IllegalArgumentException("账号已被使用");
|
|
}
|
|
}
|
|
// 校验手机号
|
|
// 校验手机号
|
|
- if (checkDuplicatePhoneNum(addPersonDTO.getPhoneNum())) {
|
|
|
|
|
|
+ if (checkDuplicatePhoneNum(addPerson4FrontEndDTO.getPhoneNum())) {
|
|
throw new IllegalArgumentException("手机号已被使用");
|
|
throw new IllegalArgumentException("手机号已被使用");
|
|
}
|
|
}
|
|
// 校验工号
|
|
// 校验工号
|
|
- if (checkDuplicateJobNumber(addPersonDTO.getJobNumber())) {
|
|
|
|
|
|
+ if (checkDuplicateJobNumber(addPerson4FrontEndDTO.getJobNumber())) {
|
|
throw new IllegalArgumentException("工号已被使用");
|
|
throw new IllegalArgumentException("工号已被使用");
|
|
}
|
|
}
|
|
// 校验邮箱
|
|
// 校验邮箱
|
|
- if (checkDuplicateMail(addPersonDTO.getMail())) {
|
|
|
|
|
|
+ if (checkDuplicateMail(addPerson4FrontEndDTO.getMail())) {
|
|
throw new IllegalArgumentException("邮箱已被使用");
|
|
throw new IllegalArgumentException("邮箱已被使用");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -464,20 +464,20 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
@Transactional
|
|
@Transactional
|
|
- public void updatePerson(UpdatePersonDTO updatePersonDTO) {
|
|
|
|
- String personId = updatePersonDTO.getId();
|
|
|
|
|
|
+ public void updatePerson(UpdatePerson4FrontEndDTO updatePerson4FrontEndDTO) {
|
|
|
|
+ String personId = updatePerson4FrontEndDTO.getId();
|
|
// 更新人员基本信息
|
|
// 更新人员基本信息
|
|
- Person person = updatePersonBaseInfo(updatePersonDTO, personId);
|
|
|
|
|
|
+ Person person = updatePersonBaseInfo(updatePerson4FrontEndDTO, personId);
|
|
// 账号基本信息发生改变,更新账号信息
|
|
// 账号基本信息发生改变,更新账号信息
|
|
String accountId = person.getAccountId();
|
|
String accountId = person.getAccountId();
|
|
if (StringUtils.isBlank(accountId)) {
|
|
if (StringUtils.isBlank(accountId)) {
|
|
throw new IllegalArgumentException("无法获取人员的账号信息,人员的账号id为空,人员id:" + personId);
|
|
throw new IllegalArgumentException("无法获取人员的账号信息,人员的账号id为空,人员id:" + personId);
|
|
}
|
|
}
|
|
SaasAccountListItemVO account = saasAccountService.querySaasAccountDetail(accountId);
|
|
SaasAccountListItemVO account = saasAccountService.querySaasAccountDetail(accountId);
|
|
- if (accountInfoChanged(updatePersonDTO, account)) {
|
|
|
|
|
|
+ if (accountInfoChanged(updatePerson4FrontEndDTO, account)) {
|
|
UpdateSaasAccountDTO updateSaasAccountDTO = ConvertPersonTool.INSTANCE.
|
|
UpdateSaasAccountDTO updateSaasAccountDTO = ConvertPersonTool.INSTANCE.
|
|
- convert2UpdateSaasAccountDTO(account, updatePersonDTO);
|
|
|
|
- updateSaasAccountDTO.setValidLast(getAccountExpireType(updatePersonDTO.getExpireDate()));
|
|
|
|
|
|
+ convert2UpdateSaasAccountDTO(account, updatePerson4FrontEndDTO);
|
|
|
|
+ updateSaasAccountDTO.setValidLast(getAccountExpireType(updatePerson4FrontEndDTO.getExpireDate()));
|
|
updateSaasAccountDTO.setValid(ValidEnum.TRUE.getType());
|
|
updateSaasAccountDTO.setValid(ValidEnum.TRUE.getType());
|
|
saasAccountService.updateSaasAccount(updateSaasAccountDTO);
|
|
saasAccountService.updateSaasAccount(updateSaasAccountDTO);
|
|
}
|
|
}
|
|
@@ -485,43 +485,43 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
// 更新账号和角色的关联
|
|
// 更新账号和角色的关联
|
|
List<SaasAccountRole> saasAccountRoles = saasAccountRoleService.
|
|
List<SaasAccountRole> saasAccountRoles = saasAccountRoleService.
|
|
querySaasAccountRoleListByAccountIdList(Lists.newArrayList(accountId));
|
|
querySaasAccountRoleListByAccountIdList(Lists.newArrayList(accountId));
|
|
- if (accountRoleChanged(saasAccountRoles, updatePersonDTO.getMainDuty(),
|
|
|
|
- updatePersonDTO.getOtherDuties(), updatePersonDTO.getOtherRoles())) {
|
|
|
|
- resetAccountRoles(updatePersonDTO, accountId);
|
|
|
|
|
|
+ if (accountRoleChanged(saasAccountRoles, updatePerson4FrontEndDTO.getMainDuty(),
|
|
|
|
+ updatePerson4FrontEndDTO.getOtherDuties(), updatePerson4FrontEndDTO.getOtherRoles())) {
|
|
|
|
+ resetAccountRoles(updatePerson4FrontEndDTO, accountId);
|
|
}
|
|
}
|
|
|
|
|
|
// 更新账号和项目的关联
|
|
// 更新账号和项目的关联
|
|
List<SaasAccountProject> saasAccountProjects = saasAccountProjectService.
|
|
List<SaasAccountProject> saasAccountProjects = saasAccountProjectService.
|
|
querySaasAccountProjectListByAccountId(accountId);
|
|
querySaasAccountProjectListByAccountId(accountId);
|
|
- if (accountProjectsChanged(saasAccountProjects, updatePersonDTO.getProjects())) {
|
|
|
|
- saasAccountProjectService.resetSaasAccountProject(accountId, updatePersonDTO.getProjects());
|
|
|
|
|
|
+ if (accountProjectsChanged(saasAccountProjects, updatePerson4FrontEndDTO.getProjects())) {
|
|
|
|
+ saasAccountProjectService.resetSaasAccountProject(accountId, updatePerson4FrontEndDTO.getProjects());
|
|
}
|
|
}
|
|
|
|
|
|
// 更新工作信息
|
|
// 更新工作信息
|
|
- List<String> depIdsAfterUpdate = updatePersonDTO.getDepIds();
|
|
|
|
|
|
+ List<String> depIdsAfterUpdate = updatePerson4FrontEndDTO.getDepIds();
|
|
updatePersonWorkResumes(depIdsAfterUpdate, personId);
|
|
updatePersonWorkResumes(depIdsAfterUpdate, personId);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
* 更新人员基本信息
|
|
* 更新人员基本信息
|
|
*
|
|
*
|
|
- * @param updatePersonDTO 更新人员入参
|
|
|
|
- * @param personId 人员id
|
|
|
|
|
|
+ * @param updatePerson4FrontEndDTO 更新人员入参
|
|
|
|
+ * @param personId 人员id
|
|
* @return 更新后的人员对象
|
|
* @return 更新后的人员对象
|
|
* @throws
|
|
* @throws
|
|
* @author lixing
|
|
* @author lixing
|
|
* @version V1.0 2021/4/9 7:30 下午
|
|
* @version V1.0 2021/4/9 7:30 下午
|
|
*/
|
|
*/
|
|
- private Person updatePersonBaseInfo(UpdatePersonDTO updatePersonDTO, String personId) {
|
|
|
|
|
|
+ private Person updatePersonBaseInfo(UpdatePerson4FrontEndDTO updatePerson4FrontEndDTO, String personId) {
|
|
Person person = getById(personId);
|
|
Person person = getById(personId);
|
|
// 直接上级不能选择自己
|
|
// 直接上级不能选择自己
|
|
- Long leaderAfterChange = updatePersonDTO.getLeader();
|
|
|
|
- if (personId.equals(leaderAfterChange.toString())) {
|
|
|
|
|
|
+ Long leaderAfterChange = updatePerson4FrontEndDTO.getLeader();
|
|
|
|
+ if (leaderAfterChange != null && personId.equals(leaderAfterChange.toString())) {
|
|
throw new IllegalArgumentException("不能选择自己作为直接上级");
|
|
throw new IllegalArgumentException("不能选择自己作为直接上级");
|
|
}
|
|
}
|
|
- person = ConvertPersonTool.INSTANCE.convertUpdateDto2Entity(person, updatePersonDTO);
|
|
|
|
|
|
+ person = ConvertPersonTool.INSTANCE.convertUpdateDto2Entity(person, updatePerson4FrontEndDTO);
|
|
person.setNamePinyin(PinyinUtil.getPinyin(person.getName(), ""));
|
|
person.setNamePinyin(PinyinUtil.getPinyin(person.getName(), ""));
|
|
- List<String> professions = updatePersonDTO.getProfessions();
|
|
|
|
|
|
+ List<String> professions = updatePerson4FrontEndDTO.getProfessions();
|
|
if (CollectionUtils.isEmpty(professions)) {
|
|
if (CollectionUtils.isEmpty(professions)) {
|
|
person.setProfession("");
|
|
person.setProfession("");
|
|
} else {
|
|
} else {
|
|
@@ -535,22 +535,22 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
/**
|
|
/**
|
|
* 重置账号与角色的关联关系
|
|
* 重置账号与角色的关联关系
|
|
*
|
|
*
|
|
- * @param updatePersonDTO 更新人员入参
|
|
|
|
- * @param accountId 账号id
|
|
|
|
|
|
+ * @param updatePerson4FrontEndDTO 更新人员入参
|
|
|
|
+ * @param accountId 账号id
|
|
* @author lixing
|
|
* @author lixing
|
|
* @version V1.0 2021/4/8 3:07 下午
|
|
* @version V1.0 2021/4/8 3:07 下午
|
|
*/
|
|
*/
|
|
- private void resetAccountRoles(UpdatePersonDTO updatePersonDTO, String accountId) {
|
|
|
|
|
|
+ private void resetAccountRoles(UpdatePerson4FrontEndDTO updatePerson4FrontEndDTO, String accountId) {
|
|
List<AddSaasAccountRoleDTO> accountRoleDTOList = Lists.newArrayList();
|
|
List<AddSaasAccountRoleDTO> accountRoleDTOList = Lists.newArrayList();
|
|
- if (StringUtils.isNotBlank(updatePersonDTO.getMainDuty())) {
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(updatePerson4FrontEndDTO.getMainDuty())) {
|
|
AddSaasAccountRoleDTO mainDutyDTO = new AddSaasAccountRoleDTO();
|
|
AddSaasAccountRoleDTO mainDutyDTO = new AddSaasAccountRoleDTO();
|
|
- mainDutyDTO.setRoleId(updatePersonDTO.getMainDuty());
|
|
|
|
|
|
+ mainDutyDTO.setRoleId(updatePerson4FrontEndDTO.getMainDuty());
|
|
mainDutyDTO.setCasType(AccountRoleTypeEnum.MAIN_DUTY.getType());
|
|
mainDutyDTO.setCasType(AccountRoleTypeEnum.MAIN_DUTY.getType());
|
|
accountRoleDTOList.add(mainDutyDTO);
|
|
accountRoleDTOList.add(mainDutyDTO);
|
|
}
|
|
}
|
|
|
|
|
|
- if (!CollectionUtils.isEmpty(updatePersonDTO.getOtherDuties())) {
|
|
|
|
- updatePersonDTO.getOtherDuties().forEach(otherDuty -> {
|
|
|
|
|
|
+ if (!CollectionUtils.isEmpty(updatePerson4FrontEndDTO.getOtherDuties())) {
|
|
|
|
+ updatePerson4FrontEndDTO.getOtherDuties().forEach(otherDuty -> {
|
|
AddSaasAccountRoleDTO otherDutyDTO = new AddSaasAccountRoleDTO();
|
|
AddSaasAccountRoleDTO otherDutyDTO = new AddSaasAccountRoleDTO();
|
|
otherDutyDTO.setRoleId(otherDuty);
|
|
otherDutyDTO.setRoleId(otherDuty);
|
|
otherDutyDTO.setCasType(AccountRoleTypeEnum.OTHER_DUTY.getType());
|
|
otherDutyDTO.setCasType(AccountRoleTypeEnum.OTHER_DUTY.getType());
|
|
@@ -558,8 +558,8 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
- if (!CollectionUtils.isEmpty(updatePersonDTO.getOtherRoles())) {
|
|
|
|
- updatePersonDTO.getOtherRoles().forEach(otherRole -> {
|
|
|
|
|
|
+ if (!CollectionUtils.isEmpty(updatePerson4FrontEndDTO.getOtherRoles())) {
|
|
|
|
+ updatePerson4FrontEndDTO.getOtherRoles().forEach(otherRole -> {
|
|
AddSaasAccountRoleDTO otherDutyDTO = new AddSaasAccountRoleDTO();
|
|
AddSaasAccountRoleDTO otherDutyDTO = new AddSaasAccountRoleDTO();
|
|
otherDutyDTO.setRoleId(otherRole);
|
|
otherDutyDTO.setRoleId(otherRole);
|
|
otherDutyDTO.setCasType(AccountRoleTypeEnum.SYS_ROLE.getType());
|
|
otherDutyDTO.setCasType(AccountRoleTypeEnum.SYS_ROLE.getType());
|
|
@@ -608,9 +608,9 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
private Boolean accountRoleChanged(
|
|
private Boolean accountRoleChanged(
|
|
List<SaasAccountRole> saasAccountRoles, String mainDuty,
|
|
List<SaasAccountRole> saasAccountRoles, String mainDuty,
|
|
List<String> otherDuties, List<String> otherRoles) {
|
|
List<String> otherDuties, List<String> otherRoles) {
|
|
-// if (otherDuties.contains(mainDuty)) {
|
|
|
|
-// throw new IllegalArgumentException("副岗不能选择和主岗相同的岗位");
|
|
|
|
-// }
|
|
|
|
|
|
+ // if (otherDuties.contains(mainDuty)) {
|
|
|
|
+ // throw new IllegalArgumentException("副岗不能选择和主岗相同的岗位");
|
|
|
|
+ // }
|
|
// 校验主岗是否发生变化
|
|
// 校验主岗是否发生变化
|
|
List<SaasAccountRole> mainDuties = saasAccountRoles.stream().filter(
|
|
List<SaasAccountRole> mainDuties = saasAccountRoles.stream().filter(
|
|
saasAccountRole -> AccountRoleTypeEnum.MAIN_DUTY.getType().equals(saasAccountRole.getCasType())
|
|
saasAccountRole -> AccountRoleTypeEnum.MAIN_DUTY.getType().equals(saasAccountRole.getCasType())
|
|
@@ -645,32 +645,32 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
/**
|
|
/**
|
|
* 判断账号基本信息是否发生变化
|
|
* 判断账号基本信息是否发生变化
|
|
*
|
|
*
|
|
- * @param updatePersonDTO 更新人员入参
|
|
|
|
- * @param account 账号实例
|
|
|
|
|
|
+ * @param updatePerson4FrontEndDTO 更新人员入参
|
|
|
|
+ * @param account 账号实例
|
|
* @return 是否发生变化
|
|
* @return 是否发生变化
|
|
* @author lixing
|
|
* @author lixing
|
|
* @version V1.0 2021/4/8 9:38 上午
|
|
* @version V1.0 2021/4/8 9:38 上午
|
|
*/
|
|
*/
|
|
- private boolean accountInfoChanged(UpdatePersonDTO updatePersonDTO, SaasAccountListItemVO account) {
|
|
|
|
|
|
+ private boolean accountInfoChanged(UpdatePerson4FrontEndDTO updatePerson4FrontEndDTO, SaasAccountListItemVO account) {
|
|
if (account != null) {
|
|
if (account != null) {
|
|
// 账号名称
|
|
// 账号名称
|
|
if (account.getUsername() != null &&
|
|
if (account.getUsername() != null &&
|
|
- !account.getUsername().equals(updatePersonDTO.getUsername())) {
|
|
|
|
|
|
+ !account.getUsername().equals(updatePerson4FrontEndDTO.getUsername())) {
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
// 登录权限
|
|
// 登录权限
|
|
if (account.getValidEndTime() != null &&
|
|
if (account.getValidEndTime() != null &&
|
|
- !account.getValidEndTime().equals(updatePersonDTO.getExpireDate())) {
|
|
|
|
|
|
+ !account.getValidEndTime().equals(updatePerson4FrontEndDTO.getExpireDate())) {
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
// 手机号码
|
|
// 手机号码
|
|
if (account.getPhoneNum() != null &&
|
|
if (account.getPhoneNum() != null &&
|
|
- !account.getPhoneNum().equals(updatePersonDTO.getPhoneNum())) {
|
|
|
|
|
|
+ !account.getPhoneNum().equals(updatePerson4FrontEndDTO.getPhoneNum())) {
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
// 邮箱
|
|
// 邮箱
|
|
return account.getMail() != null &&
|
|
return account.getMail() != null &&
|
|
- !account.getMail().equals(updatePersonDTO.getMail());
|
|
|
|
|
|
+ !account.getMail().equals(updatePerson4FrontEndDTO.getMail());
|
|
} else {
|
|
} else {
|
|
throw new IllegalArgumentException("账号信息为空");
|
|
throw new IllegalArgumentException("账号信息为空");
|
|
}
|
|
}
|
|
@@ -759,7 +759,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
* 组装分页查询结果
|
|
* 组装分页查询结果
|
|
*
|
|
*
|
|
* @param people 人员列表(单页)
|
|
* @param people 人员列表(单页)
|
|
- * @param total 人员总数量
|
|
|
|
|
|
+ * @param total 人员总数量
|
|
* @return 分页结果
|
|
* @return 分页结果
|
|
* @author lixing
|
|
* @author lixing
|
|
* @version V1.0 2021/4/14 5:51 下午
|
|
* @version V1.0 2021/4/14 5:51 下午
|
|
@@ -892,10 +892,10 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
if (batchUpdatePersonDTO.getPersonType() != null ||
|
|
if (batchUpdatePersonDTO.getPersonType() != null ||
|
|
batchUpdatePersonDTO.getProfessions() != null) {
|
|
batchUpdatePersonDTO.getProfessions() != null) {
|
|
personIds.forEach(personId -> {
|
|
personIds.forEach(personId -> {
|
|
- UpdatePersonDTO updatePersonDTO = new UpdatePersonDTO();
|
|
|
|
- updatePersonDTO.setPersonType(batchUpdatePersonDTO.getPersonType());
|
|
|
|
- updatePersonDTO.setProfessions(batchUpdatePersonDTO.getProfessions());
|
|
|
|
- updatePersonBaseInfo(updatePersonDTO, personId);
|
|
|
|
|
|
+ UpdatePerson4FrontEndDTO updatePerson4FrontEndDTO = new UpdatePerson4FrontEndDTO();
|
|
|
|
+ updatePerson4FrontEndDTO.setPersonType(batchUpdatePersonDTO.getPersonType());
|
|
|
|
+ updatePerson4FrontEndDTO.setProfessions(batchUpdatePersonDTO.getProfessions());
|
|
|
|
+ updatePersonBaseInfo(updatePerson4FrontEndDTO, personId);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
@@ -914,7 +914,8 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
addSaasAccountRoleDTO.setRoleId(batchUpdatePersonDTO.getMainDuty());
|
|
addSaasAccountRoleDTO.setRoleId(batchUpdatePersonDTO.getMainDuty());
|
|
addSaasAccountRoleDTO.setCasType(AccountRoleTypeEnum.MAIN_DUTY.getType());
|
|
addSaasAccountRoleDTO.setCasType(AccountRoleTypeEnum.MAIN_DUTY.getType());
|
|
saasAccountRoleService.resetSaasAccountRole(
|
|
saasAccountRoleService.resetSaasAccountRole(
|
|
- person.getAccountId(), Lists.newArrayList(addSaasAccountRoleDTO));
|
|
|
|
|
|
+ person.getAccountId(), AccountRoleTypeEnum.MAIN_DUTY.getType(),
|
|
|
|
+ Lists.newArrayList(addSaasAccountRoleDTO));
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
@@ -930,7 +931,8 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
return addSaasAccountRoleDTO;
|
|
return addSaasAccountRoleDTO;
|
|
}
|
|
}
|
|
).collect(Collectors.toList());
|
|
).collect(Collectors.toList());
|
|
- saasAccountRoleService.resetSaasAccountRole(person.getAccountId(), otherDuties);
|
|
|
|
|
|
+ saasAccountRoleService.resetSaasAccountRole(
|
|
|
|
+ person.getAccountId(), AccountRoleTypeEnum.OTHER_DUTY.getType(), otherDuties);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
@@ -946,7 +948,8 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
return addSaasAccountRoleDTO;
|
|
return addSaasAccountRoleDTO;
|
|
}
|
|
}
|
|
).collect(Collectors.toList());
|
|
).collect(Collectors.toList());
|
|
- saasAccountRoleService.resetSaasAccountRole(person.getAccountId(), otherRoles);
|
|
|
|
|
|
+ saasAccountRoleService.resetSaasAccountRole(
|
|
|
|
+ person.getAccountId(), AccountRoleTypeEnum.SYS_ROLE.getType(), otherRoles);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|