lijie 3 anni fa
parent
commit
1da81cb452

+ 6 - 4
src/main/java/com/persagy/proxy/report/controller/AdmReportEquipController.java

@@ -29,6 +29,7 @@ import com.persagy.proxy.adm.request.AdmZoneEquipQueryRequest;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.adm.utils.AdmQueryCriteriaHelper;
 import com.persagy.proxy.common.entity.DmpResult;
+import com.persagy.proxy.common.entity.InstanceUrlParam;
 import com.persagy.proxy.dictionary.model.AdmDict;
 import com.persagy.proxy.dictionary.model.AdmObjectType;
 import com.persagy.proxy.dictionary.service.IAdmDictService;
@@ -188,12 +189,13 @@ public class AdmReportEquipController {
         if(StrUtil.isNotEmpty(category)){
             requestData.setClassCode(category);
         }
-        List result = DigitalObjectSimpleFacade.queryEquipComponentsByProjectId(AdmContextUtil.toDmpContext().getGroupCode(), AdmContextUtil.toDmpContext().getProjectId(), AdmContextUtil.toDmpContext().getAppId(),null, requestData);
-        if(CollUtil.isNotEmpty(result)){
-            return AdmResponse.success(result);
-        }else{
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
+        List<Map<String, Object>> result = DigitalObjectSimpleFacade.queryEquipComponentsByProjectId(context.getGroupCode(),
+                context.getProjectId(), context.getAppId(),null, requestData);
+        if(CollUtil.isEmpty(result)){
             return AdmResponse.success();
         }
+        return AdmResponse.success(result);
     }
 
     /**