diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java index 23985256..630ccf95 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java @@ -44,17 +44,17 @@ public class ContractMobileServiceImpl extends ServiceImpl 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()); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java index e731c4bc..ef89957c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java @@ -265,30 +265,30 @@ public class CustomerVOServiceImpl extends ServiceImpl(); - } else { - customerQueryWrapper = (QueryWrapper)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)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)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)customerObj; +// customerNum++; +// } +// +// +// } +// } if(StringUtil.isNotEmpty(customerPagination.getSupplierCd())){ customerNum++; customerQueryWrapper.lambda().like(CustomerEntity::getSupplierCd,customerPagination.getSupplierCd());