From 8af763b9c1e925c7e83e584894ebce8b85afbb97 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 21 Aug 2023 13:53:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OtaManageApplyEOServiceImpl.java     | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index e457b0f5b..c088b58d1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -417,22 +417,22 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 				Collections.sort(otaManageApplyEOList,(e1,e2)->{
 					String e1MasterDomain = StringUtils.isNotBlank(e1.getMasterDomain()) ? e1.getMasterDomain() : "";
 					String e2MasterDomain = StringUtils.isNotBlank(e2.getMasterDomain()) ? e2.getMasterDomain() : "";
-					return comparator.compare(e1MasterDomain,e2MasterDomain);
+					return comparator.compare(e2MasterDomain,e1MasterDomain);
 				});
 			}
 		}
 		//studio
-		if("studio".equals(otaManageApplyEO.getOrderByField())){
+		if("studioText".equals(otaManageApplyEO.getOrderByField())){
 			if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){
 				Collections.sort(otaManageApplyEOList,(e1, e2)->{
-					String e1Studio = StringUtils.isNotBlank(e1.getStudio()) ? e1.getStudio() : "";
-					String e2Studio = StringUtils.isNotBlank(e2.getStudio()) ? e2.getStudio() : "";
+					String e1Studio = StringUtils.isNotBlank(e1.getStudioText()) ? e1.getStudioText() : "";
+					String e2Studio = StringUtils.isNotBlank(e2.getStudioText()) ? e2.getStudioText() : "";
 					return comparator.compare(e1Studio,e2Studio);
 				});
 			}else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){
 				Collections.sort(otaManageApplyEOList,(e1,e2)->{
-					String e1Studio = StringUtils.isNotBlank(e1.getStudio()) ? e1.getStudio() : "";
-					String e2Studio = StringUtils.isNotBlank(e2.getStudio()) ? e2.getStudio() : "";
+					String e1Studio = StringUtils.isNotBlank(e1.getStudioText()) ? e1.getStudioText() : "";
+					String e2Studio = StringUtils.isNotBlank(e2.getStudioText()) ? e2.getStudioText() : "";
 					return comparator.compare(e2Studio,e1Studio);
 				});
 			}
@@ -520,17 +520,17 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 			}
 		}
 		//匹配状态
-		if("matchStatus".equals(otaManageApplyEO.getOrderByField())){
+		if("matchStatusText".equals(otaManageApplyEO.getOrderByField())){
 			if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){
 				Collections.sort(otaManageApplyEOList,(e1, e2)->{
-					String e1MatchStatus = StringUtils.isNotBlank(e1.getMatchStatus()) ? e1.getMatchStatus() : "";
-					String e2MatchStatus = StringUtils.isNotBlank(e2.getMatchStatus()) ? e2.getMatchStatus() : "";
+					String e1MatchStatus = StringUtils.isNotBlank(e1.getMatchStatusText()) ? e1.getMatchStatusText() : "";
+					String e2MatchStatus = StringUtils.isNotBlank(e2.getMatchStatusText()) ? e2.getMatchStatusText() : "";
 					return comparator.compare(e1MatchStatus,e2MatchStatus);
 				});
 			}else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){
 				Collections.sort(otaManageApplyEOList,(e1,e2)->{
-					String e1MatchStatus = StringUtils.isNotBlank(e1.getMatchStatus()) ? e1.getMatchStatus() : "";
-					String e2MatchStatus = StringUtils.isNotBlank(e2.getMatchStatus()) ? e2.getMatchStatus() : "";
+					String e1MatchStatus = StringUtils.isNotBlank(e1.getMatchStatusText()) ? e1.getMatchStatusText() : "";
+					String e2MatchStatus = StringUtils.isNotBlank(e2.getMatchStatusText()) ? e2.getMatchStatusText() : "";
 					return comparator.compare(e2MatchStatus,e1MatchStatus);
 				});
 			}
@@ -668,7 +668,10 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 				}
 			}
 		}
-
+		if(!list.isEmpty()) {
+			//表头排序
+			heartSort(otaManageApplyEO, list);
+		}
 		Page pages = PageUtil.getPages(pageNo, pageSize, list);
 		return pages;
 	}