Merge branch 'master' into dev-wuhan-temp

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<MesEquipVariableCollectContext> queryMesEquipmentLog(List<MesEquipmentVariable> equipmentVariableList, String organizeCode, Integer equipId, Integer variableType) {
 
+        List<MesEquipVariableCollectContext> 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<String> equipVariableIdList = equipmentVariableList.stream().filter(o -> null != o).map(o -> o.getId().toString()).collect(Collectors.toList());
 
-        List<MesEquipVariableCollectContext> equipVariableCollectContextList = generateEquipVariableCollectContextList(equipmentVariableList);
-
         for (Object equipmentLog : list) {
 
             if (null == equipmentLog) continue;
@@ -100,6 +100,7 @@ public class MesEquipmentLogDao implements IMesEquipmentLogDao {
 
     private List<MesEquipVariableCollectContext> generateEquipVariableCollectContextList(List<MesEquipmentVariable> equipmentVariableList) {
         List<MesEquipVariableCollectContext> 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);