|
@@ -170,12 +170,15 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
|
JyUser jyUser = jyUserService.getByRyId(param.getRyId());
|
|
|
|
|
|
JyUser jyUser2 = jyUserService.getByRyNo(param.getRyNo());
|
|
|
- if(jyUser2 !=null){
|
|
|
- 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());
|
|
@@ -192,8 +195,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
- private User addUser(Long userId,String passwordMd5,String userName,String nickName){
|
|
|
+ private User addUser(Long userId, String passwordMd5, String userName, String nickName){
|
|
|
User user = new User();
|
|
|
user.setId(userId);
|
|
|
user.setHead(host + OssPath.default_head);
|