|
|
@@ -354,7 +354,7 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
ParamUtils.getParamName(in,bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
|
}
|
|
|
- if (customerService.checkUserName(in.getName())){
|
|
|
+ if (customerService.checkUserName(null,in.getName())){
|
|
|
res.getError().add(buildError("客户名称已存在"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -1480,7 +1480,7 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
if (userName!=null){
|
|
|
userName=userName.trim();
|
|
|
}
|
|
|
- if(customerService.checkUserName(userName)){
|
|
|
+ if(customerService.checkUserName(uid,userName)){
|
|
|
res.getError().add(buildError(ErrorConstants.CUSTOMER_ALREADY_EXIST,null,"["+userName+"]"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -1490,7 +1490,7 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
@RequestMapping(value = "/checkUserName",method = RequestMethod.GET)
|
|
|
public Result checkUserName(String userName){
|
|
|
Result res =new Result();
|
|
|
- res.data(customerService.checkUserName(userName));
|
|
|
+ res.data(customerService.checkUserName(null,userName));
|
|
|
return res;
|
|
|
}
|
|
|
|