|
|
@@ -365,10 +365,14 @@ public class UserServiceImpl implements UserService {
|
|
|
public AppBaseResponse update(User resources) throws Exception {
|
|
|
AppBaseResponse response = new AppBaseResponse();
|
|
|
User user = userRepository.findById(resources.getId()).orElseGet(User::new);
|
|
|
- Long id = userRepository.findByDeptIdAndJobNo(String.valueOf(resources.getDept().getId()), resources.getJobNo());
|
|
|
- if (id != null && !id.equals(resources.getId())) {
|
|
|
- response.fail(ResultCode.JOB_NO_ALREADY_EXISTS);
|
|
|
- return response;
|
|
|
+ String jobNo = resources.getJobNo();
|
|
|
+
|
|
|
+ if (StringUtils.isNotBlank(jobNo)){
|
|
|
+ Long id= userRepository.findByDeptIdAndJobNo(String.valueOf(resources.getDept().getId()), resources.getJobNo());
|
|
|
+ if (id != null && !id.equals(resources.getId())) {
|
|
|
+ response.fail(ResultCode.JOB_NO_ALREADY_EXISTS);
|
|
|
+ return response;
|
|
|
+ }
|
|
|
}
|
|
|
ValidationUtil.isNull(user.getId(), "User", "id", resources.getId());
|
|
|
|