敏感及重要用户功能

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/utils/PubUtil.java

@@ -76,10 +76,17 @@ public class PubUtil {
     }
 
     public static String getDicById(String name, List<DictData> dictData) {
-        List<DictData> dictDataList = dictData.stream().filter(x -> x.getName().indexOf(name) != -1).collect(Collectors.toList());
+        //先匹配有没有完全吻合的
+        List<DictData> compareDictDataList = dictData.stream().filter(x -> x.getName().equalsIgnoreCase(name)).collect(Collectors.toList());
+        if(CollUtil.isNotEmpty(compareDictDataList)){
+            return compareDictDataList.get(0).getId();
+        }
+        //如果没有匹配到，则判断是否有包含的
+        List<DictData> dictDataList = dictData.stream().filter(x -> x.getName().contains(name)).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(dictDataList)) {
             return dictDataList.get(0).getId();
         }
+        //实在没有匹配到则返回空
         return "";
     }