脱敏优化

ruoyi-common/src/main/java/com/ruoyi/common/utils/DesensitizedUtil.java

@@ -30,30 +30,37 @@ public class DesensitizedUtil {
 
         if (dealerName.contains("市")) {
             int indexArea = dealerName.indexOf("市");
+            if(indexArea> 4){
+                indexArea =4;
+            }else{
+                indexArea = 4;
+            }
             int endIndex = dealerName.indexOf("有限公司");
             if (endIndex > 0) {
                 endIndex = dealerName.length() - 5;
             }else{
-                endIndex =dealerName.length() - 3;
+                endIndex =dealerName.length() - 5;
             }
-            dealerName = StringUtils.hide(dealerName, indexArea+2, endIndex);
+            dealerName = StringUtils.hide(dealerName, indexArea, endIndex);
         } else {
             // 不包含市，需要初始化 超过三个字的市 一个集合 ，像内蒙古 哈尔滨等
             String[] citys = {"内蒙古", "黑龙江", "吉林", "辽宁", "河北", "河南", "山东", "山西", "陕西", "新疆", "西藏", "甘肃", "宁夏", "青海", "海南"};
-            int startIndex = 3;
-            if (StringUtils.containsAny(dealerName, citys)) {
-                // 返回包含的 下标
-                for (String city : citys) {
-                    int indexCity = dealerName.indexOf(city);
-                    if (indexCity > -1) {
-                        startIndex = dealerName.indexOf(indexCity)+1;
-                        break;
-                    }
-                }
-            }
+            int startIndex = 4;
+//            if (StringUtils.containsAny(dealerName, citys)) {
+//                // 返回包含的 下标
+//                for (String city : citys) {
+//                    int indexCity = dealerName.indexOf(city);
+//                    if (indexCity > -1) {
+//                        startIndex = dealerName.indexOf(indexCity)+1;
+//                        break;
+//                    }
+//                }
+//            }
             int endIndex = dealerName.indexOf("有限公司");
-            if (endIndex < 0) {
-                endIndex = dealerName.length() - 4;
+            if (endIndex > 0) {
+                endIndex = dealerName.length() - 5;
+            }else{
+                endIndex = 5;
             }
             dealerName = StringUtils.hide(dealerName, startIndex, endIndex);
         }