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 { List getArchiveAskQuestions (String id); - List getAskQuestionsByakId (String id,String state); + List getAskQuestionsByakId (@Param("id") String id,@Param("state") String state); List 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 im resultMap.put("BUSSFINECLASSSHOW",relist); List> arr = new ArrayList<>(); resultMap.put("STANDCLASSIFYSHOW",arr); + + List> standclassify= (List>) resultMap.get("STANDCLASSIFY"); + List arrayList=new ArrayList<>(); + Map> data=new HashMap<>(); + standclassify.forEach(stringStringMap -> { + arrayList.add(stringStringMap.get("label")); + data.put(stringStringMap.get("label"),stringStringMap); + }); + Collections.sort(arrayList); + List> res=new ArrayList<>(); + arrayList.forEach(s -> res.add(data.get(s))); + resultMap.put("STANDCLASSIFY",res); return resultMap; }