java110 4 lat temu
rodzic
commit
bf14e70cc8

+ 3 - 0
service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java

@@ -8,6 +8,7 @@ import com.java110.core.context.IPageData;
 import com.java110.core.context.SecureInvocation;
 import com.java110.core.context.SecureInvocation;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.basePrivilege.BasePrivilegeDto;
 import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.store.StoreDto;
 import com.java110.dto.user.UserDto;
 import com.java110.dto.user.UserDto;
 import com.java110.entity.component.ComponentValidateResult;
 import com.java110.entity.component.ComponentValidateResult;
 import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
@@ -470,6 +471,8 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
             if (paramIn.containsKey("communityId")
             if (paramIn.containsKey("communityId")
                     && !StringUtil.isEmpty(paramIn.getString("communityId"))
                     && !StringUtil.isEmpty(paramIn.getString("communityId"))
                     && !"-1".equals(paramIn.getString("communityId"))
                     && !"-1".equals(paramIn.getString("communityId"))
+                    && !StoreDto.STORE_TYPE_ADMIN.equals(storeTypeCd)
+                    && !StoreDto.STORE_TYPE_DEV.equals(storeTypeCd)
             ) {
             ) {
                 communityId = paramIn.getString("communityId");
                 communityId = paramIn.getString("communityId");
                 checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
                 checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);

+ 1 - 1
service-user/src/main/java/com/java110/user/cmd/menuGroupCommunity/UpdateMenuGroupCommunityCmd.java

@@ -96,7 +96,7 @@ public class UpdateMenuGroupCommunityCmd extends AbstractServiceCmdListener {
         menuGroupCommunityPo.setCommunityId(reqJson.getString("communityId"));
         menuGroupCommunityPo.setCommunityId(reqJson.getString("communityId"));
         int flag = menuGroupCommunityV1InnerServiceSMOImpl.deleteMenuGroupCommunity(menuGroupCommunityPo);
         int flag = menuGroupCommunityV1InnerServiceSMOImpl.deleteMenuGroupCommunity(menuGroupCommunityPo);
         if (flag < 1) {
         if (flag < 1) {
-            throw new CmdException("删除数据失败");
+            //throw new CmdException("删除数据失败"); //有可能 已经上线的客户 没有 这个数据 所以不需判断
         }
         }
 
 
         List<MenuGroupDto> menuGroupDtos = null;
         List<MenuGroupDto> menuGroupDtos = null;