|
|
@@ -216,17 +216,32 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
Integer pageSize) {
|
|
|
cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
|
|
|
Map<String, Object> params = disposeParams(cli);
|
|
|
+ String name=null;
|
|
|
+ String orgCode=null;
|
|
|
+ if (StringUtils.isContainChinese(cli.getName())){
|
|
|
+ name= cli.getName();
|
|
|
+ }else {
|
|
|
+ if (StringUtils.isBlank(cli.getName())){
|
|
|
+ return new Pagination<>();
|
|
|
+ }
|
|
|
+ orgCode= cli.getName();
|
|
|
+ }
|
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)) {
|
|
|
params.put("role", 1);
|
|
|
- params.put("name", cli.getName());
|
|
|
+ if (name!=null)params.put("name",name);
|
|
|
+ else params.put("orgCode",orgCode);
|
|
|
} else {
|
|
|
//处理为空报错
|
|
|
params.put("role", 0);
|
|
|
- String [] names =pushNames(cli.getName());
|
|
|
- if (names.length>0){
|
|
|
- params.put("names", names);
|
|
|
+ if (orgCode!=null) {
|
|
|
+ params.put("orgCode",orgCode);
|
|
|
}else {
|
|
|
- return new Pagination<>();
|
|
|
+ String [] names =pushNames(name);
|
|
|
+ if (names.length>0){
|
|
|
+ params.put("names", names);
|
|
|
+ }else {
|
|
|
+ return new Pagination<>();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
Pagination<CustomerListOut> p = (Pagination<CustomerListOut>) findPage("selectOrganizationCustomerList",
|
|
|
@@ -306,8 +321,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
params.put("channel", cli.getChannel());
|
|
|
if (null != cli.getBusinessScope())
|
|
|
params.put("businessScope", cli.getBusinessScope());
|
|
|
- if (null != cli.getOrgCode())
|
|
|
- params.put("orgCode", cli.getOrgCode());
|
|
|
return params;
|
|
|
}
|
|
|
|