From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 18f651b..7818cf3 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
@@ -8,6 +8,7 @@
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;
@@ -93,6 +94,9 @@
}
if (!headers.containsKey(CommonConstant.HTTP_APP_ID)) {
headers.put(CommonConstant.HTTP_APP_ID, pd.getAppId());
+ }
+ if (!headers.containsKey(CommonConstant.APP_ID)) {
+ headers.put(CommonConstant.APP_ID, pd.getAppId());
}
if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
headers.put(CommonConstant.HTTP_TRANSACTION_ID, GenerateCodeFactory.getUUID());
@@ -470,6 +474,8 @@
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