Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-distributed-java

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpChemicalServiceImpl.java

@@ -30,6 +30,7 @@ import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
 import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
 import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType;
 import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -497,8 +498,13 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
 
     @Override
     public List<Map<String, Object>> queryCriticaliBySubId(List<Long> subIds) {
-        List<Map<String, Object>> map = hxpChemicalMapper.queryCriticaliBySubId(subIds);
-        return map;
+        List<Map<String, Object>> list = hxpChemicalMapper.queryCriticaliBySubId(subIds);
+        if(CollectionUtils.isNotEmpty(list)){
+            if(list.get(0) == null){
+                list.remove(0);
+            }
+        }
+        return list;
     }
 
     @Override