|
@@ -54,6 +54,8 @@ public class UserService {
|
|
|
copyUserFromUAS();
|
|
copyUserFromUAS();
|
|
|
//2.校验用户名密码在BI中是否存在
|
|
//2.校验用户名密码在BI中是否存在
|
|
|
User user = userMapper.getBIUserByName(userName);
|
|
User user = userMapper.getBIUserByName(userName);
|
|
|
|
|
+ String uaer_Name=null;
|
|
|
|
|
+ int bu_Id = 0;
|
|
|
if (null == user) {
|
|
if (null == user) {
|
|
|
user = userMapper.getBIUserByMobile(userName);
|
|
user = userMapper.getBIUserByMobile(userName);
|
|
|
}
|
|
}
|
|
@@ -64,8 +66,16 @@ public class UserService {
|
|
|
if ("离职".equals(user.getState())) {
|
|
if ("离职".equals(user.getState())) {
|
|
|
throw new MyException(RepCode.NoUser);
|
|
throw new MyException(RepCode.NoUser);
|
|
|
}
|
|
}
|
|
|
- //插入
|
|
|
|
|
- userMapper.addUser(user);
|
|
|
|
|
|
|
+ User userIdName = userMapper.getBIUserByName(user.getUserName());
|
|
|
|
|
+ uaer_Name=userIdName.getUserName();
|
|
|
|
|
+ bu_Id=userIdName.getId();
|
|
|
|
|
+ if(uaer_Name.equals(user.getUserName())){
|
|
|
|
|
+ user.setId(bu_Id);
|
|
|
|
|
+ userMapper.updateUser(user);
|
|
|
|
|
+ }else {
|
|
|
|
|
+ //插入
|
|
|
|
|
+ userMapper.addUser(user);
|
|
|
|
|
+ }
|
|
|
}else {
|
|
}else {
|
|
|
String role = user.getRole();
|
|
String role = user.getRole();
|
|
|
password = user.getPassWord();
|
|
password = user.getPassWord();
|