|
|
@@ -1437,29 +1437,32 @@ public class ApiController extends BaseController {
|
|
|
AuthorizationUtils.clearAllCachedAuthorizationInfo();
|
|
|
int i = userService.updateUser(user);
|
|
|
if(i>0){
|
|
|
- int cleanNum;
|
|
|
+ //这里可能不存在绑定信息
|
|
|
if(StringUtils.isNotBlank(user.getUserSource()) && user.getUserSource().equals("0")){
|
|
|
- cleanNum = ccExtNumService.updateUserCodeByLoginName(user.getCompanyName(),user.getLoginName());
|
|
|
+ ccExtNumService.updateUserCodeByLoginName(user.getCompanyName(),user.getLoginName());
|
|
|
}else{
|
|
|
//先清除原分机绑定
|
|
|
- cleanNum = ccExtNumService.cleanCcExtNumByUserCode(user.getLoginName());
|
|
|
+ ccExtNumService.cleanCcExtNumByUserCode(user.getLoginName());
|
|
|
}
|
|
|
- if(cleanNum>0){
|
|
|
- //修改绑定分机
|
|
|
- CcExtNum extNum = new CcExtNum();
|
|
|
- extNum.setExtNum(user.getExtNum());
|
|
|
- extNum.setUserCode(user.getLoginName());
|
|
|
- int updateNum = ccExtNumService.updateCcExtNumByUserCode(extNum);
|
|
|
- if(updateNum>0){
|
|
|
- CcExtNum num = ccExtNumService.selectCcExtNumByExtNum(user.getExtNum());
|
|
|
- if(null != num){
|
|
|
- user.setExtPass(num.getExtPass());
|
|
|
- return AjaxResult.success(user);
|
|
|
- }
|
|
|
+ //修改绑定分机
|
|
|
+ CcExtNum extNum = new CcExtNum();
|
|
|
+ extNum.setExtNum(user.getExtNum());
|
|
|
+ extNum.setUserCode(user.getLoginName());
|
|
|
+ int updateNum = ccExtNumService.updateCcExtNumByUserCode(extNum);
|
|
|
+ if(updateNum>0){
|
|
|
+ CcExtNum num = ccExtNumService.selectCcExtNumByExtNum(user.getExtNum());
|
|
|
+ if(null != num){
|
|
|
+ user.setExtPass(num.getExtPass());
|
|
|
+ return AjaxResult.success(user);
|
|
|
+ }else{
|
|
|
+ throw new RuntimeException("分机号:"+user.getExtNum()+" 不存在");
|
|
|
}
|
|
|
+ }else{
|
|
|
+ throw new RuntimeException("分机号重绑失败");
|
|
|
}
|
|
|
+ }else{
|
|
|
+ throw new RuntimeException("修改用户失败");
|
|
|
}
|
|
|
- throw new RuntimeException("修改用户失败");
|
|
|
}
|
|
|
|
|
|
/**
|