From 492d77212bb4bee5557da56cc1c6661f9e2e3ab0 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Sun, 2 Apr 2023 09:12:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E8=BF=9B=E7=A8=8B=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E5=8E=BB=E6=8E=89appPermission?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ContractMobileServiceImpl.java       | 22 ++++-----
 .../service/impl/CustomerVOServiceImpl.java   | 48 +++++++++----------
 2 files changed, 35 insertions(+), 35 deletions(-)

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