|
|
@@ -215,14 +215,15 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
public Pagination<CustomerListOut> listAllOrganizationCustomer(CustomerListIn cli, Integer pageNo,
|
|
|
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 {
|
|
|
orgCode= cli.getName();
|
|
|
+ cli.setName(null);
|
|
|
}
|
|
|
+ Map<String, Object> params = disposeParams(cli);
|
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)) {
|
|
|
params.put("role", 1);
|
|
|
if (name!=null)params.put("name",name);
|