|
|
|
@ -265,30 +265,30 @@ public class CustomerVOServiceImpl extends ServiceImpl<CustomerVMapper, Customer
|
|
|
|
|
boolean pcPermission = true;
|
|
|
|
|
boolean appPermission = true;
|
|
|
|
|
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
|
|
|
|
|
if(isPc && pcPermission){
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()){
|
|
|
|
|
Object customerObj=authorizeService.getCondition(new AuthorizeConditionModel(customerQueryWrapper,customerPagination.getMenuId(),"customer"));
|
|
|
|
|
if (ObjectUtil.isEmpty(customerObj)){
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
|
customerQueryWrapper = (QueryWrapper<CustomerEntity>)customerObj;
|
|
|
|
|
customerNum++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(!isPc && appPermission){
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()){
|
|
|
|
|
Object customerObj=authorizeService.getCondition(new AuthorizeConditionModel(customerQueryWrapper,customerPagination.getMenuId(),"customer"));
|
|
|
|
|
if (ObjectUtil.isEmpty(customerObj)){
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
|
customerQueryWrapper = (QueryWrapper<CustomerEntity>)customerObj;
|
|
|
|
|
customerNum++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// if(isPc && pcPermission){
|
|
|
|
|
// if (!userProvider.get().getIsAdministrator()){
|
|
|
|
|
// Object customerObj=authorizeService.getCondition(new AuthorizeConditionModel(customerQueryWrapper,customerPagination.getMenuId(),"customer"));
|
|
|
|
|
// if (ObjectUtil.isEmpty(customerObj)){
|
|
|
|
|
// return new ArrayList<>();
|
|
|
|
|
// } else {
|
|
|
|
|
// customerQueryWrapper = (QueryWrapper<CustomerEntity>)customerObj;
|
|
|
|
|
// customerNum++;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// if(!isPc && appPermission){
|
|
|
|
|
// if (!userProvider.get().getIsAdministrator()){
|
|
|
|
|
// Object customerObj=authorizeService.getCondition(new AuthorizeConditionModel(customerQueryWrapper,customerPagination.getMenuId(),"customer"));
|
|
|
|
|
// if (ObjectUtil.isEmpty(customerObj)){
|
|
|
|
|
// return new ArrayList<>();
|
|
|
|
|
// } else {
|
|
|
|
|
// customerQueryWrapper = (QueryWrapper<CustomerEntity>)customerObj;
|
|
|
|
|
// customerNum++;
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
//
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
if(StringUtil.isNotEmpty(customerPagination.getSupplierCd())){
|
|
|
|
|
customerNum++;
|
|
|
|
|
customerQueryWrapper.lambda().like(CustomerEntity::getSupplierCd,customerPagination.getSupplierCd());
|
|
|
|
|