Browse Source

fix: 修复行政区划查询问题

master_tdsql
hxh 4 months ago
parent
commit
35eab8b58f
  1. 24
      shuili-system/src/main/java/com/kms/yxgh/common/dto/IAdcd.java

24
shuili-system/src/main/java/com/kms/yxgh/common/dto/IAdcd.java

@ -8,18 +8,24 @@ public interface IAdcd {
default String getAdcdQx() { default String getAdcdQx() {
String userAdcd = UserUtils.getAdcd(); String userAdcd = UserUtils.getAdcd();
String targetAdcd = getAdcd(); String adcd = getAdcd();
if (targetAdcd == null) { if (adcd == null) {
return userAdcd == null ? null : userAdcd.replaceAll("00(00)?$", ""); adcd = userAdcd;
} }
if (userAdcd == null) { if (adcd == null) {
return targetAdcd.replaceAll("00(00)?$", ""); return null;
} }
userAdcd = userAdcd.replaceAll("00(00)?$", ""); int index = adcd.length() - 1;
if (targetAdcd.startsWith(userAdcd)) { while (index >= 0 && adcd.charAt(index) == '0') {
return targetAdcd.replaceAll("00(00)?$", ""); index--;
}
if (index < 0) {
return adcd;
}
if (index > 5) {
return adcd.replaceAll("000(000)?$", "");
} else { } else {
return userAdcd; return adcd.substring(0, 6).replaceAll("00(00)?$", "");
} }
} }
} }

Loading…
Cancel
Save