From f67f41ee3eb644ddc01ed4cf2a142bde86c42151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 27 Jun 2023 19:52:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT,=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=8C=89=E6=95=B0=E9=87=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 5513b6a31..0ba3101b2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -2055,7 +2055,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	private void projectDetailsStatisticsGroupByTerritoryHearSort(List<Map<String, Object>> dataList,Map<String,Object> params) {
 		String orderByField = (String) params.get("orderByField");
 		String orderBy = (String) params.get("orderBy");
-		if(CollectionUtils.isNotEmpty(dataList) && StringUtils.isNotEmpty(orderByField) && StringUtils.isNotEmpty(orderBy)){
+		if(CollectionUtils.isNotEmpty(dataList)){
 			Collator comparator = Collator.getInstance(Locale.CHINESE);
 			Collections.sort(dataList,(data1,data2)->{
 				String param1 = "";
@@ -2071,10 +2071,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 					}
 				}
 				// 数量
-				if("amount".equals(orderByField)){
+				if(StringUtils.isEmpty(orderByField) || "amount".equals(orderByField)){
 					double p1 = data1.get("amount") != null ? (double) data1.get("amount") : 0;
 					double p2 = data2.get("amount") != null ? (double) data2.get("amount") : 0;
-					if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+					if(StringUtils.isEmpty(orderBy) || OrderEnum.POSITIVE.getValue().equals(orderBy)){
 						return (int)(p1 - p2);
 					}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
 						return (int)(p2 - p1);