Merge remote-tracking branch 'origin/developer' into developer

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceApiServiceImpl.java

@@ -17,6 +17,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
+import com.gic.enterprise.service.EnterpriseApiService;
 import com.gic.member.config.api.dto.AppletsConfigSimpleOutputDTO;
 import com.gic.member.config.api.dto.OwnerMemberCardDTO;
 import com.gic.member.config.api.dto.ServiceConfigSimpleOutputDTO;
@@ -25,7 +26,6 @@ import com.gic.member.config.api.service.MemberCardApiService;
 import com.gic.member.config.api.service.ServiceConfigApiService;
 import com.gic.member.filter.api.dto.CrowdWidgetDTO;
 import com.gic.member.filter.api.service.CrowdWidgetApiService;
-import com.gic.open.api.dto.EnterpriseServeInfoDTO;
 import com.gic.open.api.service.EnterpriseLicenseApiService;
 import com.gic.store.service.StoreWidgetApiService;
 import org.apache.commons.collections.CollectionUtils;
@@ -73,6 +73,8 @@ public class ResourceApiServiceImpl implements ResourceApiService {
     private CrowdWidgetApiService crowdWidgetApiService;
     @Autowired
     private EnterpriseLicenseApiService enterpriseLicenseApiService;
+    @Autowired
+    private EnterpriseApiService enterpriseApiService;
 
     @Override
     @Transactional
@@ -280,8 +282,7 @@ public class ResourceApiServiceImpl implements ResourceApiService {
             return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
         }
 
-        ServiceResponse<EnterpriseServeInfoDTO> serveInfo = enterpriseLicenseApiService.getServeInfo(user.getEnterpriseId(), "gic");
-        if (user.getSuperAdmin() == 1 || "basic".equals(serveInfo.getResult().getVersionCode())) {
+        if (user.getSuperAdmin() == 1 || "basic".equals(enterpriseApiService.getEnterpriseById(user.getEnterpriseId()).getResult().getVersionCode())) {
             List<OwnerMemberCardDTO> memberCardList = memberCardApiService.getAllContainDel(user.getEnterpriseId()).getResult();
             List<AppletsConfigSimpleOutputDTO> appletList = appletsConfigApiService.listAppletConfigAppIdContainDel(user.getEnterpriseId()).getResult();
             List<ServiceConfigSimpleOutputDTO> serviceList = serviceConfigApiService.listServiceConfigAppIdContainDel(user.getEnterpriseId()).getResult();