|
|
@@ -1289,7 +1289,7 @@ public class ApiController extends BaseController {
|
|
|
List<CcExtNum> list = ccExtNumService.selectCcExtNumList(ccExtNum);
|
|
|
if(!CollectionUtils.isEmpty(list)){
|
|
|
list.forEach(extNum -> {
|
|
|
- if(StringUtils.isNotBlank(extNum.getUserCode()) && extNum.getUserCode().startsWith("Runtian_")){
|
|
|
+ if(StringUtils.isNotBlank(extNum.getUserCode()) && extNum.getUserCode().startsWith("Runtian_cp_")){
|
|
|
extNum.setUserCode("");
|
|
|
}
|
|
|
});
|
|
|
@@ -1405,8 +1405,13 @@ public class ApiController extends BaseController {
|
|
|
AuthorizationUtils.clearAllCachedAuthorizationInfo();
|
|
|
int i = userService.updateUser(user);
|
|
|
if(i>0){
|
|
|
- //先清除原分机绑定
|
|
|
- int cleanNum = ccExtNumService.cleanCcExtNumByUserCode(user.getLoginName());
|
|
|
+ int cleanNum;
|
|
|
+ if(StringUtils.isNotBlank(user.getUserSource()) && user.getUserSource().equals("0")){
|
|
|
+ cleanNum = ccExtNumService.updateUserCodeByLoginName(user.getCompanyName(),user.getLoginName());
|
|
|
+ }else{
|
|
|
+ //先清除原分机绑定
|
|
|
+ cleanNum = ccExtNumService.cleanCcExtNumByUserCode(user.getLoginName());
|
|
|
+ }
|
|
|
if(cleanNum>0){
|
|
|
//修改绑定分机
|
|
|
CcExtNum extNum = new CcExtNum();
|