|
@@ -183,15 +183,15 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
|
JyUser jyUser = jyUserService.getByRyId(param.getRyId());
|
|
|
|
|
|
JyUser jyUser2 = jyUserService.getByRyNo(param.getRyNo());
|
|
|
+
|
|
|
+ if(jyUser == null && jyUser2!=null){
|
|
|
+ throw new BusinessException(ResultCode.RYNO_EXITS);
|
|
|
+ }
|
|
|
+ if(jyUser != null && !jyUser2.getId().equals(jyUser.getId())){
|
|
|
+ throw new BusinessException(ResultCode.RYNO_EXITS);
|
|
|
+ }
|
|
|
if(jyUser == null){
|
|
|
jyUser = new JyUser();
|
|
|
- if(jyUser2 !=null){
|
|
|
- throw new BusinessException(ResultCode.RYNO_EXITS);
|
|
|
- }
|
|
|
- }else {
|
|
|
- if(jyUser2 !=null && !jyUser2.getRyNo().equals(param.getRyNo())){
|
|
|
- throw new BusinessException(ResultCode.RYNO_EXITS);
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
User user = this.addUser(jyUser.getUserId(),passwordMd5, param.getRyNo(), param.getNickName());
|