|
@@ -412,8 +412,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
if (StringUtils.isBlank(idCard)) {
|
|
|
return null;
|
|
|
}
|
|
|
- QueryWrapper<Person> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq(Person.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
+ QueryWrapper<Person> queryWrapper = getDefaultPersonQueryWrapper();
|
|
|
queryWrapper.eq(Person.PROP_ID_NUMBER, idCard);
|
|
|
return list(queryWrapper);
|
|
|
}
|
|
@@ -431,8 +430,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
- QueryWrapper<Person> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq(Person.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
+ QueryWrapper<Person> queryWrapper = getDefaultPersonQueryWrapper();
|
|
|
queryWrapper.eq(Person.PROP_USERNAME, username);
|
|
|
return list(queryWrapper);
|
|
|
}
|
|
@@ -449,8 +447,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
if (StringUtils.isBlank(jobNumber)) {
|
|
|
return null;
|
|
|
}
|
|
|
- QueryWrapper<Person> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq(Person.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
+ QueryWrapper<Person> queryWrapper = getDefaultPersonQueryWrapper();
|
|
|
queryWrapper.eq(Person.PROP_JOB_NUMBER, jobNumber);
|
|
|
return list(queryWrapper);
|
|
|
}
|
|
@@ -547,9 +544,13 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
private Person updatePersonBaseInfo(UpdatePerson4FrontEndDTO updatePerson4FrontEndDTO, String personId) {
|
|
|
Person person = getById(personId);
|
|
|
// 直接上级不能选择自己
|
|
|
- Long leaderAfterChange = updatePerson4FrontEndDTO.getLeader();
|
|
|
+ String leaderAfterChange = updatePerson4FrontEndDTO.getLeader();
|
|
|
checkLeader(leaderAfterChange, person);
|
|
|
person = ConvertPersonTool.INSTANCE.convertUpdateDto2Entity(person, updatePerson4FrontEndDTO);
|
|
|
+ // 数据库中leader是long型,这里加一个特殊处理
|
|
|
+ if ("".equals(person.getLeader())) {
|
|
|
+ person.setLeader(null);
|
|
|
+ }
|
|
|
person.setNamePinyin(PinyinUtil.getPinyin(person.getName(), ""));
|
|
|
List<String> professions = updatePerson4FrontEndDTO.getProfessions();
|
|
|
if (CollectionUtils.isEmpty(professions)) {
|
|
@@ -570,19 +571,19 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
* @author lixing
|
|
|
* @version V1.0 2021/4/22 11:43 上午
|
|
|
*/
|
|
|
- private void checkLeader(Long leaderId, Person person) {
|
|
|
- if (leaderId == null) {
|
|
|
+ private void checkLeader(String leaderId, Person person) {
|
|
|
+ if (StringUtils.isBlank(leaderId)) {
|
|
|
return;
|
|
|
}
|
|
|
String personId = person.getId();
|
|
|
- if (personId.equals(leaderId.toString())) {
|
|
|
+ if (personId.equals(leaderId)) {
|
|
|
throw new IllegalArgumentException("不能选择自己作为直接上级");
|
|
|
}
|
|
|
// 不能选择直接上级是自己的员工作为上级
|
|
|
List<Person> people = queryByLeader(Long.valueOf(personId));
|
|
|
people.forEach(tmpPerson -> {
|
|
|
String tmpPersonId = tmpPerson.getId();
|
|
|
- if (tmpPersonId.equals(leaderId.toString())) {
|
|
|
+ if (tmpPersonId.equals(leaderId)) {
|
|
|
throw new IllegalArgumentException("不能选择自己的下级作为直接上级");
|
|
|
}
|
|
|
});
|
|
@@ -764,8 +765,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
if (StringUtils.isBlank(accountId)) {
|
|
|
throw new IllegalArgumentException("根据账号id查询人员,账号id为空");
|
|
|
}
|
|
|
- QueryWrapper<Person> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq(Person.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
+ QueryWrapper<Person> queryWrapper = getDefaultPersonQueryWrapper();
|
|
|
queryWrapper.eq(Person.PROP_ACCOUNT_ID, accountId);
|
|
|
List<Person> people = list(queryWrapper);
|
|
|
if (!CollectionUtils.isEmpty(people)) {
|
|
@@ -848,9 +848,10 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // 设置账号的过期时间
|
|
|
+ // 设置账号的过期时间和头像
|
|
|
SaasAccountListItemVO saasAccountListItemVO = saasAccountService.querySaasAccountDetail(
|
|
|
responsePersonListItem.getAccountId());
|
|
|
+ responsePersonListItem.setHeadPortrait(saasAccountListItemVO.getHeadPortrait());
|
|
|
String validLast = saasAccountListItemVO.getValidLast();
|
|
|
if (ExpireTypeEnum.EXPIRY_DATE.getType().equals(validLast)) {
|
|
|
responsePersonListItem.setExpireDate(saasAccountListItemVO.getValidEndTime());
|
|
@@ -1108,6 +1109,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
SaasAccountListItemVO saasAccountListItemVO = saasAccountService.querySaasAccountDetail(accountId);
|
|
|
responsePersonItemVO.setMail(saasAccountListItemVO.getMail());
|
|
|
responsePersonItemVO.setPhoneNum(saasAccountListItemVO.getPhoneNum());
|
|
|
+ responsePersonItemVO.setHeadPortrait(saasAccountListItemVO.getHeadPortrait());
|
|
|
if (ExpireTypeEnum.EXPIRY_DATE.getType().equals(saasAccountListItemVO.getValidLast())) {
|
|
|
responsePersonItemVO.setExpireDate(saasAccountListItemVO.getValidEndTime());
|
|
|
}
|
|
@@ -1219,8 +1221,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
public LatestJobNumberVO queryLatestJobNumber() {
|
|
|
LatestJobNumberVO latestJobNumberVO = new LatestJobNumberVO();
|
|
|
|
|
|
- QueryWrapper<Person> personQueryWrapper = new QueryWrapper<>();
|
|
|
- personQueryWrapper.eq(Person.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
+ QueryWrapper<Person> personQueryWrapper = getDefaultPersonQueryWrapper();
|
|
|
personQueryWrapper.ne(Person.PROP_JOB_NUMBER, "");
|
|
|
personQueryWrapper.orderByDesc(Person.PROP_CREATIONTIME);
|
|
|
|
|
@@ -1269,8 +1270,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
|
|
|
@Override
|
|
|
public IPage<ResponsePersonListItemVO> queryByUserName(QueryByUserNameDTO queryByUserNameDTO) {
|
|
|
- QueryWrapper<Person> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq(Person.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
+ QueryWrapper<Person> queryWrapper = getDefaultPersonQueryWrapper();
|
|
|
queryWrapper.eq(Person.PROP_USERNAME, queryByUserNameDTO.getUsername());
|
|
|
List<Person> result = list(queryWrapper);
|
|
|
return packagePageResult(result, result.size());
|
|
@@ -1281,6 +1281,9 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
if (StringUtils.isBlank(phoneNumber)) {
|
|
|
return false;
|
|
|
}
|
|
|
+ if (person == null) {
|
|
|
+ return checkDuplicatePhoneNum(phoneNumber);
|
|
|
+ }
|
|
|
SaasAccountListItemVO saasAccountListItemVO = saasAccountService.querySaasAccountDetail(person.getAccountId());
|
|
|
String accountPhoneNumber = saasAccountListItemVO.getPhoneNum();
|
|
|
if (phoneNumber.equals(accountPhoneNumber)) {
|
|
@@ -1354,4 +1357,25 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
|
|
|
return checkDuplicateMail(mail);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public IPage<ResponsePersonListItemVO> queryByName(QueryByNameDTO queryByNameDTO) {
|
|
|
+ QueryWrapper<Person> queryWrapper = getDefaultPersonQueryWrapper();
|
|
|
+ queryWrapper.like(Person.PROP_NAME, queryByNameDTO.getName());
|
|
|
+ List<Person> result = list(queryWrapper);
|
|
|
+ return packagePageResult(result, result.size());
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取人员默认查询参数对象
|
|
|
+ *
|
|
|
+ * @return QueryWrapper
|
|
|
+ * @author lixing
|
|
|
+ * @version V1.0 2021/4/25 3:07 下午
|
|
|
+ */
|
|
|
+ private QueryWrapper<Person> getDefaultPersonQueryWrapper() {
|
|
|
+ QueryWrapper<Person> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq(Person.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
+ return queryWrapper;
|
|
|
+ }
|
|
|
}
|