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