From d84adae7f5ee5e4b2824ff2a975a58961cc17b79 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 23 Sep 2024 18:06:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BC=8F=E4=BF=A1=E5=8F=B7=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/pcn/apiservice/daoimpl/MesEquipmentLogDao.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesEquipmentLogDao.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesEquipmentLogDao.java index 6e9dd2e..9667baf 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesEquipmentLogDao.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesEquipmentLogDao.java @@ -33,6 +33,8 @@ public class MesEquipmentLogDao implements IMesEquipmentLogDao { @Override public List queryMesEquipmentLog(List equipmentVariableList, String organizeCode, Integer equipId, Integer variableType) { + List equipVariableCollectContextList = generateEquipVariableCollectContextList(equipmentVariableList); + if (CollectionUtils.isEmpty(equipmentVariableList) || StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(equipId) || StringUtils.isEmpty(variableType)) return null; StringBuffer builder = new StringBuffer(); @@ -47,12 +49,10 @@ public class MesEquipmentLogDao implements IMesEquipmentLogDao { query.setParameter(MesPcnExtConstWords.VARIABLE_TYPE, variableType); List list = query.getResultList(); - if (CollectionUtils.isEmpty(list)) return null; + if (CollectionUtils.isEmpty(list)) return equipVariableCollectContextList; List equipVariableIdList = equipmentVariableList.stream().filter(o -> null != o).map(o -> o.getId().toString()).collect(Collectors.toList()); - List equipVariableCollectContextList = generateEquipVariableCollectContextList(equipmentVariableList); - for (Object equipmentLog : list) { if (null == equipmentLog) continue; @@ -100,6 +100,7 @@ public class MesEquipmentLogDao implements IMesEquipmentLogDao { private List generateEquipVariableCollectContextList(List equipmentVariableList) { List equipVariableCollectContextList = new ArrayList<>(); + if (CollectionUtils.isEmpty(equipmentVariableList)) return equipVariableCollectContextList; equipmentVariableList.stream().filter(o -> null != o).forEach(o -> { MesEquipVariableCollectContext equipVariableCollectContext = new MesEquipVariableCollectContext(o.getId()); BeanUtils.copyProperties(o, equipVariableCollectContext);