From 973762b1e78c684d9dd3879efe0f3dd6eb4a4873 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 26 Dec 2023 21:25:32 +0800
Subject: [PATCH] 楼盘查询异常修改,排序异常修改

---
 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml |    1 +
 src/main/java/org/springblade/common/utils/ComplexNumberStringComparator.java            |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/common/utils/ComplexNumberStringComparator.java b/src/main/java/org/springblade/common/utils/ComplexNumberStringComparator.java
index 2542563..c64dae9 100644
--- a/src/main/java/org/springblade/common/utils/ComplexNumberStringComparator.java
+++ b/src/main/java/org/springblade/common/utils/ComplexNumberStringComparator.java
@@ -1,5 +1,7 @@
 package org.springblade.common.utils;
 
+import org.apache.logging.log4j.util.Strings;
+
 public class ComplexNumberStringComparator{
 
 	public static int compare(String s1, String s2) {
@@ -35,6 +37,9 @@
 		while (end < s.length() && Character.isDigit(s.charAt(end))) {
 			end++;
 		}
+		if (start==end){
+			return 0;
+		}
 		return Integer.parseInt(s.substring(start, end));
 	}
 
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index 6341475..8fbe960 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -111,6 +111,7 @@
         select aoi_code as id,sub_aoi as name,1 as addressType from jczz_doorplate_address
         where 1=1
         and aoi_code !=''
+        and aoi_name =''
         and sub_aoi != ''
         <if test="houseParam.name != null and houseParam.name!=''">
             and nei_name = #{houseParam.name}

--
Gitblit v1.9.3