From 2a837925abd950d9db12fc73be9116beada488a6 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 21 Jun 2022 13:56:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=E7=BB=99=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E7=B1=BB=E5=88=AB=E5=BC=BA=E8=A1=8C=E6=8D=A2=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=20=E4=BC=9A=E5=AF=BC=E8=87=B4bug=E4=BA=A7=E7=94=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/slrs/StandardQA/dao/AskQuestionsDao.java  |  2 +-
 .../da/sys/service/impl/DicTypeEOServiceImpl.java    | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java
index 6607aa07..2d20fa48 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java
@@ -36,7 +36,7 @@ public interface AskQuestionsDao extends BaseMapper<AskQuestions> {
 
     List<AskQuestions> getArchiveAskQuestions (String id);
 
-    List<Reply> getAskQuestionsByakId (String id,String state);
+    List<Reply> getAskQuestionsByakId (@Param("id") String id,@Param("state") String state);
 
     List<String> getUId();
 }
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java
index 67b64bae..0da857fc 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java
@@ -187,6 +187,18 @@ public class DicTypeEOServiceImpl extends ServiceImpl<DicTypeEODao,DicTypeEO> im
         resultMap.put("BUSSFINECLASSSHOW",relist);
         List<Map<String,String >> arr = new ArrayList<>();
         resultMap.put("STANDCLASSIFYSHOW",arr);
+
+        List<Map<String,String >> standclassify= (List<Map<String, String>>) resultMap.get("STANDCLASSIFY");
+        List<String> arrayList=new ArrayList<>();
+        Map<String,Map<String,String>> data=new HashMap<>();
+        standclassify.forEach(stringStringMap -> {
+            arrayList.add(stringStringMap.get("label"));
+            data.put(stringStringMap.get("label"),stringStringMap);
+        });
+        Collections.sort(arrayList);
+        List<Map<String,String >> res=new ArrayList<>();
+        arrayList.forEach(s -> res.add(data.get(s)));
+        resultMap.put("STANDCLASSIFY",res);
         return resultMap;
     }