Merge branch 'master' into dev-wuhan-temp

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionProcessContext.java

@@ -251,7 +251,7 @@ public class MesProductionProcessContext implements Serializable {
     public List<MesEquipmentVariableCfg> getEquipVariableCfgListByVct(String variableCfgType) {
         List<MesEquipmentVariableCfg> equipmentVariableCfgList = getEquipVariableCfgList();
         return (StringUtils.isEmpty(variableCfgType) || CollectionUtils.isEmpty(equipmentVariableCfgList)) ? null :
-                equipmentVariableCfgList.stream().filter(o -> (null != o && o.getVariableCfgType().equals(variableCfgType))).collect(Collectors.toList());
+                equipmentVariableCfgList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getCategoryLevelTwo()) && o.getVariableCfgType().equals(variableCfgType))).collect(Collectors.toList());
     }
 
     //上下文赋值数据变量接口逻辑对象集合