Commit edda78c8 by zhiwj

单域版

parent 12a56d13
......@@ -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();
......
......@@ -81,8 +81,8 @@ public class ResourceController {
}
}
@RequestMapping("/save-resource")
public RestResponse saveResource(@RequestBody ResourceQO resourceQO) {
@RequestMapping("/save-resource")
public RestResponse saveResource(@RequestBody ResourceQO resourceQO) {
ResourceDTO resourceDTO = EntityUtil.changeEntityByJSON(ResourceDTO.class, resourceQO);
resourceDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment