浏览代码

fix : 质量报告bug测试

lvxianyun 3 年之前
父节点
当前提交
c96e46f2c7
共有 1 个文件被更改,包括 0 次插入2 次删除
  1. 0 2
      src/main/java/com/persagy/proxy/report/controller/AdmReportEquipController.java

+ 0 - 2
src/main/java/com/persagy/proxy/report/controller/AdmReportEquipController.java

@@ -1102,7 +1102,6 @@ public class AdmReportEquipController {
     private List<ObjectInfoDefine> gatherDynamicInfoCode(Boolean visible, Set<String> classCodeSet, Boolean common){
     private List<ObjectInfoDefine> gatherDynamicInfoCode(Boolean visible, Set<String> classCodeSet, Boolean common){
         //获取信息点
         //获取信息点
         AdmQueryCriteria admQueryCriteria = new AdmQueryCriteria();
         AdmQueryCriteria admQueryCriteria = new AdmQueryCriteria();
-
         ObjectNode criteria = JsonNodeFactory.instance.objectNode();
         ObjectNode criteria = JsonNodeFactory.instance.objectNode();
         ArrayNode arrayNode = criteria.putObject("classCode").putArray("$in");
         ArrayNode arrayNode = criteria.putObject("classCode").putArray("$in");
         classCodeSet.stream().forEach(classCode -> arrayNode.add(classCode));
         classCodeSet.stream().forEach(classCode -> arrayNode.add(classCode));
@@ -1114,7 +1113,6 @@ public class AdmReportEquipController {
         if(common){
         if(common){
             filters = filters +" projectId = '0' and groupCode = '0' ";
             filters = filters +" projectId = '0' and groupCode = '0' ";
         }
         }
-        filters = filters +" and classCode in ['"+StrUtil.join("','",classCodeSet)+"']";
         admQueryCriteria.setFilters(filters);
         admQueryCriteria.setFilters(filters);
         QueryCriteria queryCriteria = AdmQueryCriteriaHelper.toDmpCriteria(admQueryCriteria);
         QueryCriteria queryCriteria = AdmQueryCriteriaHelper.toDmpCriteria(admQueryCriteria);
         List<ObjectInfoDefine> staticInfoCode = DigitalObjectInfoFacade.query(AdmContextUtil.toDmpContext().getGroupCode(), AdmContextUtil.toDmpContext().getProjectId(), AdmCommonConstant.APP_ID,null,queryCriteria);
         List<ObjectInfoDefine> staticInfoCode = DigitalObjectInfoFacade.query(AdmContextUtil.toDmpContext().getGroupCode(), AdmContextUtil.toDmpContext().getProjectId(), AdmCommonConstant.APP_ID,null,queryCriteria);