【居民信息】护照，掩码修改

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java

@@ -161,12 +161,15 @@ public class MaskProcessor {
             return originString.replaceAll("^(\\d{10})\\d+([a-zA-Z0-9]{2})$", new StringBuilder("$1").append(maskStr).append("$2").toString());
         } else if (regexUtil.getTypeEnum() == IdCardTypeEnum.PASSPORT) {
             // 护照，前两位，后两位为明文，其他*
-            String maskStr = StrUtil.repeatByLength("*", originString.length() - 4);
+            int clearLength = 4;
-            return originString.replaceAll("^([a-zA-Z0-9]{2})\\d+(\\d{2})$", new StringBuilder("$1").append(maskStr).append("$2").toString());
+            int maskedLength = 0;
-        } else {
+            if ((maskedLength = originString.length() - clearLength) > 0) {
-            // 其他情况，不码
+                String maskStr = StrUtil.repeatByLength("*", maskedLength);
-            return originString;
+                return originString.replaceAll("^([a-zA-Z0-9]{2})[a-zA-Z0-9]+([a-zA-Z0-9]{2})$", new StringBuilder("$1").append(maskStr).append("$2").toString());
+            }
         }
+
+        return originString;
     }
 
     /**