|
@@ -14,6 +14,7 @@ import com.persagy.apm.report.dependencies.saasweb.model.dto.QueryProjectDTO;
|
|
|
import com.persagy.apm.report.dependencies.saasweb.model.vo.*;
|
|
|
import com.persagy.apm.report.dependencies.saasweb.service.ISaasWebService;
|
|
|
import com.persagy.apm.report.userconfig.reporttype.service.IReportTypeService;
|
|
|
+import com.persagy.framework.tenant.mybatis.datasource.db.holder.SaasContext;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
@@ -330,6 +331,7 @@ public class SaasWebServiceImpl implements ISaasWebService {
|
|
|
// 获取用户可选的所有项目
|
|
|
PoemsFeignBaseDTO poemsFeignBaseDTO = new PoemsFeignBaseDTO();
|
|
|
poemsFeignBaseDTO.setDefaultValue();
|
|
|
+ poemsFeignBaseDTO.setGroupCode(SaasContext.getContextGroupCode());
|
|
|
PoemsFeignResponse<UserProjectsInfoVO> currentUserProjectsInfosResponse = saasWebClientWrapper.
|
|
|
getCurrentUserProjectsInfo(poemsFeignBaseDTO);
|
|
|
List<UserProjectsInfoVO> currentUserProjectsInfos = currentUserProjectsInfosResponse.getContent();
|
|
@@ -407,6 +409,7 @@ public class SaasWebServiceImpl implements ISaasWebService {
|
|
|
// 获取业态下所有的子业态
|
|
|
PoemsFeignBaseDTO poemsFeignBaseDTO = new PoemsFeignBaseDTO();
|
|
|
poemsFeignBaseDTO.setDefaultValue();
|
|
|
+ poemsFeignBaseDTO.setGroupCode(SaasContext.getContextGroupCode());
|
|
|
PoemsFeignResponse<FunctionTypeVO> functionTypesResponse = saasWebClientWrapper.getAllProjectFunctionTypes(poemsFeignBaseDTO);
|
|
|
List<FunctionTypeVO> functionTypeVOList = functionTypesResponse.getContent();
|
|
|
return recursiveFindSonBuildingTypes(buildingType, functionTypeVOList);
|
|
@@ -596,6 +599,7 @@ public class SaasWebServiceImpl implements ISaasWebService {
|
|
|
private List<PartitionProjectVO> getAvailableProjectTree() {
|
|
|
PoemsFeignBaseDTO poemsFeignBaseDTO = new PoemsFeignBaseDTO();
|
|
|
poemsFeignBaseDTO.setDefaultValue();
|
|
|
+ poemsFeignBaseDTO.setGroupCode(SaasContext.getContextGroupCode());
|
|
|
PoemsFeignResponse<UserPartitionProjectsInfoVO> partitionsResponse = saasWebClientWrapper.getCurrentUserPartitionProjectsInfo(poemsFeignBaseDTO);
|
|
|
List<UserPartitionProjectsInfoVO> userPartitionProjects = partitionsResponse.getContent();
|
|
|
if (CollectionUtils.isEmpty(userPartitionProjects)) {
|