From 5d3cc225a0db1cf55c7eded578e9262643228af2 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 16 Aug 2022 09:45:10 +0800
Subject: [PATCH] =?UTF-8?q?57934=20=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E5=88=86=E7=B1=BB=E6=8E=92=E5=BA=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...oblemKnowledgeBaseClassifyEOServiceImpl.java | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java
index c8359bbdc..615865026 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java
@@ -3,6 +3,7 @@ package com.jero.modules.problemKnowledgeBase.service.impl;
 import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO;
 import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseClassifyEOMapper;
 import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseClassifyEOService;
+import com.jero.modules.project.entity.ConditionAssessmentEO;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.util.StringUtils;
@@ -10,10 +11,8 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Date;
+import java.text.Collator;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -99,7 +98,15 @@ public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl<Probl
 	 */
 	@Override
     public List<ProblemKnowledgeBaseClassifyEO> queryList() {
-        return list();
+		List<ProblemKnowledgeBaseClassifyEO> result = this.list();
+		// 匿名比较器排序
+		Collections.sort(result, new Comparator<ProblemKnowledgeBaseClassifyEO>() {
+			@Override
+			public int compare(ProblemKnowledgeBaseClassifyEO p1, ProblemKnowledgeBaseClassifyEO p2) {
+				return p1.getProblemLabel().compareTo(p2.getProblemLabel());
+			}
+		});
+		return result;
     }
 
 	@Override