From 4e134e61ede1f8574189af45c810ca365c7c7f9a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 五月 2022 18:33:14 +0800
Subject: [PATCH] 优化代码

---
 service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java b/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java
index 1a34c9f..b74a74b 100644
--- a/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java
+++ b/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java
@@ -5,8 +5,10 @@
 import com.java110.api.properties.WechatAuthProperties;
 import com.java110.core.component.AbstractComponentSMO;
 import com.java110.core.context.IPageData;
+import com.java110.core.context.SecureInvocation;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.store.StoreDto;
 import com.java110.dto.user.UserDto;
 import com.java110.entity.component.ComponentValidateResult;
 import com.java110.intf.user.IUserInnerServiceSMO;
@@ -19,7 +21,7 @@
 import com.java110.utils.util.*;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -346,7 +348,8 @@
         }
 
         ResultVo resultVo = getCommunityStoreInfoSMOImpl.checkUserHasResourceListener(restTemplate, pd, paramIn, pd.getUserId());
-        if (resultVo == null || resultVo.getCode() != ResultVo.CODE_OK) {
+        if (resultVo == null ||
+                resultVo.getCode() != ResultVo.CODE_OK) {
             throw new UnsupportedOperationException("鐢ㄦ埛娌℃湁鏉冮檺鎿嶄綔");
         }
         JSONArray privileges = JSONArray.parseArray(resultVo.getMsg());
@@ -465,7 +468,12 @@
             JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
 
             String communityId = "";
-            if (paramIn.containsKey("communityId") && !StringUtil.isEmpty(paramIn.getString("communityId"))) {
+            if (paramIn.containsKey("communityId")
+                    && !StringUtil.isEmpty(paramIn.getString("communityId"))
+                    && !"-1".equals(paramIn.getString("communityId"))
+                    && !StoreDto.STORE_TYPE_ADMIN.equals(storeTypeCd)
+                    && !StoreDto.STORE_TYPE_DEV.equals(storeTypeCd)
+            ) {
                 communityId = paramIn.getString("communityId");
                 checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
             }

--
Gitblit v1.8.0