|
|
@@ -64,8 +64,14 @@ public class UserService {
|
|
|
if ("离职".equals(user.getState())) {
|
|
|
throw new MyException(RepCode.NoUser);
|
|
|
}
|
|
|
- //插入
|
|
|
- userMapper.addUser(user);
|
|
|
+ //如果用手机号查询到是UAS账户 则将该账号更新到已有账号
|
|
|
+ if("mobile".equals(user.getPost())){
|
|
|
+ user = userMapper.getBIUserByName(user.getUserName());
|
|
|
+ user.setPhone(userName);
|
|
|
+ userMapper.updateUser(user);
|
|
|
+ }else{
|
|
|
+ userMapper.addUser(user);
|
|
|
+ }
|
|
|
}else {
|
|
|
String role = user.getRole();
|
|
|
password = user.getPassWord();
|
|
|
@@ -119,6 +125,7 @@ public class UserService {
|
|
|
User user = userMapper.getUserMessByName(userName);
|
|
|
if (null == user) {
|
|
|
user = userMapper.getUserMessByMobile(userName);
|
|
|
+ user.setPost("mobile");
|
|
|
}
|
|
|
DynamicDataSourceContextHolder.clearDataSourceType();
|
|
|
if (null == user) {
|