|
@@ -166,12 +166,11 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
* @version V1.0 2021/3/26 11:42 上午
|
|
|
*/
|
|
|
private void saveAccountRole(String accountId, String roleId, String accountRoleType) {
|
|
|
- AddSaasAccountRoleDTO mainDutyDTO = new AddSaasAccountRoleDTO();
|
|
|
- mainDutyDTO.setDefaultValue();
|
|
|
- mainDutyDTO.setAccountId(accountId);
|
|
|
- mainDutyDTO.setRoleId(roleId);
|
|
|
- mainDutyDTO.setCasType(accountRoleType);
|
|
|
- saasAccountRoleService.createSaasAccountRole(mainDutyDTO);
|
|
|
+ AddSaasAccountRoleDTO addAccountRoleDTO = new AddSaasAccountRoleDTO();
|
|
|
+ addAccountRoleDTO.setAccountId(accountId);
|
|
|
+ addAccountRoleDTO.setRoleId(roleId);
|
|
|
+ addAccountRoleDTO.setCasType(accountRoleType);
|
|
|
+ saasAccountRoleService.createSaasAccountRole(addAccountRoleDTO);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -264,6 +263,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
private void checkPhoneNum(String phoneNum) {
|
|
|
PageQuerySaasAccountDTO pageQuerySaasAccountDTO = new PageQuerySaasAccountDTO();
|
|
|
pageQuerySaasAccountDTO.setDefaultValue();
|
|
|
+ pageQuerySaasAccountDTO.setAccountId(null);
|
|
|
pageQuerySaasAccountDTO.setPhoneNum(phoneNum);
|
|
|
FmResponseContent<List<SaasAccountListItemVO>> listFmResponseContent = saasAccountClient.querySaasAccountPageList(pageQuerySaasAccountDTO);
|
|
|
if (listFmResponseContent.getCount() > 0) {
|
|
@@ -389,6 +389,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
// TODO: 2021/4/1
|
|
|
// 判断是否有账号相关的更新
|
|
|
// 判断是否有工作信息相关的更新
|
|
|
+ List<String> depIds = updatePersonDTO.getDepIds();
|
|
|
List<WorkResume> workResumes = workResumeService.queryWorkResumeListByPersonIdList(Lists.newArrayList(personId));
|
|
|
|
|
|
}
|
|
@@ -457,15 +458,17 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
|
|
|
for (ResponsePersonListItemVO responsePersonListItem : responsePersonListItems) {
|
|
|
// 设置人员主岗副岗信息
|
|
|
- AccountRoleVO accountRoleVO = accountRoleVoMap.get(responsePersonListItem.getAccountId());
|
|
|
- if (accountRoleVO != null) {
|
|
|
- responsePersonListItem.setMainDuty(accountRoleVO.getMainDuty());
|
|
|
- responsePersonListItem.setOtherDuties(accountRoleVO.getOtherDuties());
|
|
|
+ if (accountRoleVoMap != null) {
|
|
|
+ AccountRoleVO accountRoleVO = accountRoleVoMap.get(responsePersonListItem.getAccountId());
|
|
|
+ if (accountRoleVO != null) {
|
|
|
+ responsePersonListItem.setMainDuty(accountRoleVO.getMainDuty());
|
|
|
+ responsePersonListItem.setOtherDuties(accountRoleVO.getOtherDuties());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// 设置员工类型
|
|
|
- String type = responsePersonListItem.getType();
|
|
|
- responsePersonListItem.setPersonType(getPersonTypeVO(type));
|
|
|
+ String type = responsePersonListItem.getPersonType();
|
|
|
+ responsePersonListItem.setPersonTypeVO(getPersonTypeVO(type));
|
|
|
|
|
|
// 设置专业
|
|
|
String profession = responsePersonListItem.getProfession();
|
|
@@ -586,16 +589,18 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
String accountId = person.getAccountId();
|
|
|
Map<String, AccountRoleVO> accountRoleVoMap = saasAccountRoleService.
|
|
|
queryAccountRoleVoMapByAccountIdList(Lists.newArrayList(accountId));
|
|
|
- AccountRoleVO accountRoleVO = accountRoleVoMap.get(accountId);
|
|
|
- if (accountRoleVO != null) {
|
|
|
- responsePersonItemVO.setMainDuty(accountRoleVO.getMainDuty());
|
|
|
- responsePersonItemVO.setOtherDuties(accountRoleVO.getOtherDuties());
|
|
|
- responsePersonItemVO.setOtherRoles(accountRoleVO.getOtherRoles());
|
|
|
+ if (accountRoleVoMap != null) {
|
|
|
+ AccountRoleVO accountRoleVO = accountRoleVoMap.get(accountId);
|
|
|
+ if (accountRoleVO != null) {
|
|
|
+ responsePersonItemVO.setMainDuty(accountRoleVO.getMainDuty());
|
|
|
+ responsePersonItemVO.setOtherDuties(accountRoleVO.getOtherDuties());
|
|
|
+ responsePersonItemVO.setOtherRoles(accountRoleVO.getOtherRoles());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// 设置员工类型
|
|
|
- String type = person.getType();
|
|
|
- responsePersonItemVO.setPersonType(getPersonTypeVO(type));
|
|
|
+ String type = person.getPersonType();
|
|
|
+ responsePersonItemVO.setPersonTypeVO(getPersonTypeVO(type));
|
|
|
|
|
|
// 设置专业
|
|
|
String profession = person.getProfession();
|
|
@@ -641,6 +646,9 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
* @version V1.0 2021/4/1 2:53 下午
|
|
|
*/
|
|
|
private SimpleObjVO getLeaderVO(String leaderId) {
|
|
|
+ if (StringUtils.isBlank(leaderId)) {
|
|
|
+ return new SimpleObjVO();
|
|
|
+ }
|
|
|
Person person = queryPersonProfile(leaderId);
|
|
|
return new SimpleObjVO(leaderId, person.getName());
|
|
|
}
|