From 7cee6151b42670dbcd8c08fb4716c8d9414a951b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 02 十二月 2022 19:00:34 +0800
Subject: [PATCH] 优化代码

---
 service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java
index 0a0c519..c61e04f 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java
@@ -52,13 +52,21 @@
         basePrivilegeDto.setResource("/viewGroupResource");
         basePrivilegeDto.setUserId(userId);
         List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
-        if (reqJson.containsKey("operationType") && reqJson.getString("operationType").equals("1000") && privileges.size() > 0) {
+        if ("1000".equals(reqJson.getString("operationType")) && privileges.size() > 0) {
             resourceStoreDto.setShType("");
             resourceStoreDto.setShObjIds(new String[]{reqJson.getString("communityId"), reqJson.getString("storeId")});
         } else if (StorehouseDto.SH_TYPE_COMMUNITY.equals(resourceStoreDto.getShType()) || privileges.size() == 0) {
-            resourceStoreDto.setShType(StorehouseDto.SH_TYPE_COMMUNITY);
+            //add by wuxw 杩欓噷 淇敼涓� 灏忓尯浠撳簱涔熻兘閲囪喘 妯″紡 鎵�浠ヨ繖閲屼笉闄愬埗
+            //resourceStoreDto.setShType(StorehouseDto.SH_TYPE_COMMUNITY);
             resourceStoreDto.setShObjId(reqJson.getString("communityId"));
         }
+        BasePrivilegeDto basePrivilegeDto1 = new BasePrivilegeDto();
+        basePrivilegeDto1.setResource("/viewHiddenWarehouse");
+        basePrivilegeDto1.setUserId(userId);
+        List<Map> viewHiddenWarehousePrivileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto1);
+        if (viewHiddenWarehousePrivileges.size() == 0) {
+            resourceStoreDto.setIsShow("true");
+        }
         int count = resourceStoreInnerServiceSMOImpl.queryResourceStoresCount(resourceStoreDto);
         List<ApiResourceStoreDataVo> resourceStores = new ArrayList<>();
         //璁$畻鎬讳环(灏忚)

--
Gitblit v1.8.0