供应进程分析去掉appPermission

product
bawei 2 years ago
parent 310f6c8412
commit 492d77212b

@ -44,17 +44,17 @@ public class ContractMobileServiceImpl extends ServiceImpl<ContractMobileMapper,
QueryWrapper<ContractMobileEntity> contractMobileQueryWrapper = new QueryWrapper<>();
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()) {
return new ArrayList<>();
}
}
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
return new ArrayList<>();
}
}
// boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
// if (isPc && pcPermission) {
// if (!userProvider.get().getIsAdministrator()) {
// return new ArrayList<>();
// }
// }
// if (!isPc && appPermission) {
// if (!userProvider.get().getIsAdministrator()) {
// return new ArrayList<>();
// }
// }
if (StringUtil.isNotEmpty(contractMobilePagination.getContractCode())) {
contractMNum++;
contractMobileQueryWrapper.lambda().like(ContractMobileEntity::getContractCode, contractMobilePagination.getContractCode());

@ -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());

Loading…
Cancel
Save