fix-[厦门馆二期]:修改排序返回方式为list

src/main/java/com/ruoyi/project/VRdemo/controller/ConsultationController.java

@@ -52,7 +52,12 @@ public class ConsultationController extends BaseController {
     @Anonymous
     @GetMapping("/list")
     public AjaxResult list(Consultation consultation) {
-        return consultationService.selectConsultationListByMenu(consultation);
+        List<HashMap<String, List<Consultation>>> list = consultationService.selectConsultationListByMenu(consultation);
+
+        AjaxResult ajaxResult = new AjaxResult();
+        ajaxResult.put("code", 200);
+        ajaxResult.put("rows", list);
+        return ajaxResult;
     }
 
     /**

src/main/java/com/ruoyi/project/VRdemo/controller/EconomyController.java

@@ -52,7 +52,12 @@ public class EconomyController extends BaseController {
     @Anonymous
     @GetMapping("/list")
     public AjaxResult list(Economy economy) {
-        return economyService.selectEconomyListByMenu(economy);
+        List<HashMap<String, List<Economy>>> list = economyService.selectEconomyListByMenu(economy);
+
+        AjaxResult ajaxResult = new AjaxResult();
+        ajaxResult.put("code", 200);
+        ajaxResult.put("rows", list);
+        return ajaxResult;
     }
 
     /**

src/main/java/com/ruoyi/project/VRdemo/controller/InstitutionController.java

@@ -52,7 +52,12 @@ public class InstitutionController extends BaseController {
     @Anonymous
     @GetMapping("/list")
     public AjaxResult list(Institution institution) {
-        return institutionService.selectInstitutionListByMenu(institution);
+        List<HashMap<String, List<Institution>>> list = institutionService.selectInstitutionListByMenu(institution);
+
+        AjaxResult ajaxResult = new AjaxResult();
+        ajaxResult.put("code", 200);
+        ajaxResult.put("rows", list);
+        return ajaxResult;
     }
 
     /**

src/main/java/com/ruoyi/project/VRdemo/controller/PublicationController.java

@@ -52,7 +52,12 @@ public class PublicationController extends BaseController {
     @Anonymous
     @GetMapping("/list")
     public AjaxResult list(Publication publication) {
-       return publicationService.selectPublicationListByMenu(publication);
+        List<HashMap<String, List<Publication>>> list = publicationService.selectPublicationListByMenu(publication);
+
+        AjaxResult ajaxResult = new AjaxResult();
+        ajaxResult.put("code", 200);
+        ajaxResult.put("rows", list);
+        return ajaxResult;
     }
 
     /**

src/main/java/com/ruoyi/project/VRdemo/controller/RegionDevelopController.java

@@ -53,7 +53,12 @@ public class RegionDevelopController extends BaseController {
     @Anonymous
     @GetMapping("/list")
     public AjaxResult list(RegionDevelop regionDevelop) {
-        return regionDevelopService.selectRegionDevelopListByMenu(regionDevelop);
+        List<HashMap<String, List<RegionDevelop>>> list = regionDevelopService.selectRegionDevelopListByMenu(regionDevelop);
+
+        AjaxResult ajaxResult = new AjaxResult();
+        ajaxResult.put("code", 200);
+        ajaxResult.put("rows", list);
+        return ajaxResult;
     }
 
     /**

src/main/java/com/ruoyi/project/VRdemo/service/IConsultationService.java

@@ -36,7 +36,7 @@ public interface IConsultationService {
      * @param consultation 博雅集南洋资讯检索
      * @return 博雅集南洋资讯检索集合
      */
-    AjaxResult selectConsultationListByMenu(Consultation consultation);
+    List<HashMap<String, List<Consultation>>> selectConsultationListByMenu(Consultation consultation);
 
     /**
      * 新增博雅集南洋资讯检索

src/main/java/com/ruoyi/project/VRdemo/service/IEconomyService.java

@@ -36,7 +36,7 @@ public interface IEconomyService {
      * @param economy 东南亚经济统计
      * @return 东南亚经济统计集合
      */
-    AjaxResult selectEconomyListByMenu(Economy economy);
+    List<HashMap<String, List<Economy>>> selectEconomyListByMenu(Economy economy);
 
     /**
      * 新增东南亚经济统计

src/main/java/com/ruoyi/project/VRdemo/service/IInstitutionService.java

@@ -36,7 +36,7 @@ public interface IInstitutionService {
      * @param institution 博雅集东南亚研究机构
      * @return 博雅集东南亚研究机构集合
      */
-    AjaxResult selectInstitutionListByMenu(Institution institution);
+    List<HashMap<String, List<Institution>>>  selectInstitutionListByMenu(Institution institution);
 
     /**
      * 新增博雅集东南亚研究机构

src/main/java/com/ruoyi/project/VRdemo/service/IPublicationService.java

@@ -36,7 +36,7 @@ public interface IPublicationService {
      * @param publication 东南亚连续出版物
      * @return 东南亚连续出版物集合
      */
-    AjaxResult selectPublicationListByMenu(Publication publication);
+    List<HashMap<String, List<Publication>>>  selectPublicationListByMenu(Publication publication);
 
     /**
      * 新增东南亚连续出版物

src/main/java/com/ruoyi/project/VRdemo/service/IRegionDevelopService.java

@@ -32,11 +32,10 @@ public interface IRegionDevelopService {
 
     /**
      *
-     *
      * @param regionDevelop 东南亚地区发展报告
      * @return 东南亚地区发展报告集合
      */
-    AjaxResult selectRegionDevelopListByMenu(RegionDevelop regionDevelop);
+    List<HashMap<String, List<RegionDevelop>>>  selectRegionDevelopListByMenu(RegionDevelop regionDevelop);
 
     /**
      * 新增东南亚地区发展报告

src/main/java/com/ruoyi/project/VRdemo/service/impl/ConsultationServiceImplImpl.java

@@ -62,16 +62,18 @@ public class ConsultationServiceImplImpl implements IConsultationService {
      * @return 博雅集南洋资讯检索集合
      */
     @Override
-    public AjaxResult selectConsultationListByMenu(Consultation consultation) {
+    public List<HashMap<String, List<Consultation>>> selectConsultationListByMenu(Consultation consultation) {
         LibraryMenu parentMenu = libraryMenuMapper.selectLibraryMenuByModule("consultation");
         List<LibraryMenu> menuList = libraryMenuMapper.selectChildMenuListById(parentMenu.getId());
-        AjaxResult data = new AjaxResult();
+        List<HashMap<String, List<Consultation>>> list = new ArrayList<>();
         for (LibraryMenu menu : menuList){
             List<Consultation> consultations = consultationMapper.selectConsultationListByAffiliation(menu.getTitle());
-            data.put(menu.getTitle(), consultations);
+            HashMap<String, List<Consultation>> dataMap = new HashMap<>();
+            dataMap.put(menu.getTitle(), consultations);
+            list.add(dataMap);
         }
 
-        return data;
+        return list;
     }
 
     /**

src/main/java/com/ruoyi/project/VRdemo/service/impl/EconomyServiceImpl.java

@@ -63,16 +63,18 @@ public class EconomyServiceImpl implements IEconomyService {
      * @return 东南亚经济统计集合
      */
     @Override
-    public AjaxResult selectEconomyListByMenu(Economy economy) {
+    public List<HashMap<String, List<Economy>>> selectEconomyListByMenu(Economy economy) {
         LibraryMenu parentMenu = libraryMenuMapper.selectLibraryMenuByModule("economy");
         List<LibraryMenu> menuList = libraryMenuMapper.selectChildMenuListById(parentMenu.getId());
-        AjaxResult data = new AjaxResult();
+        List<HashMap<String, List<Economy>>> list = new ArrayList<>();
         for (LibraryMenu menu : menuList){
             List<Economy> economies = economyMapper.selectEconomyListByAffiliation(menu.getTitle());
+            HashMap<String, List<Economy>> data = new HashMap<>();
             data.put(menu.getTitle(), economies);
+            list.add(data);
         }
 
-        return data;
+        return list;
     }
 
     /**

src/main/java/com/ruoyi/project/VRdemo/service/impl/InstitutionServiceImpl.java

@@ -63,16 +63,18 @@ public class InstitutionServiceImpl implements IInstitutionService {
      * @return 博雅集东南亚研究机构集合
      */
     @Override
-    public AjaxResult selectInstitutionListByMenu(Institution institution) {
+    public List<HashMap<String, List<Institution>>> selectInstitutionListByMenu(Institution institution) {
         LibraryMenu parentMenu = libraryMenuMapper.selectLibraryMenuByModule("institution");
         List<LibraryMenu> menuList = libraryMenuMapper.selectChildMenuListById(parentMenu.getId());
-        AjaxResult data = new AjaxResult();
+        List<HashMap<String, List<Institution>>> list = new ArrayList<>();
         for (LibraryMenu menu : menuList){
             List<Institution> institutions = institutionMapper.selectInstitutionListByAffiliation(menu.getTitle());
+            HashMap<String, List<Institution>> data = new HashMap<>();
             data.put(menu.getTitle(), institutions);
+            list.add(data);
         }
 
-        return data;
+        return list;
     }
 
     /**

src/main/java/com/ruoyi/project/VRdemo/service/impl/PublicationServiceImpl.java

@@ -62,16 +62,18 @@ public class PublicationServiceImpl implements IPublicationService {
      * @return 东南亚连续出版物集合
      */
     @Override
-    public AjaxResult selectPublicationListByMenu(Publication publication) {
+    public  List<HashMap<String, List<Publication>>> selectPublicationListByMenu(Publication publication) {
         LibraryMenu parentMenu = libraryMenuMapper.selectLibraryMenuByModule("publication");
         List<LibraryMenu> menuList = libraryMenuMapper.selectChildMenuListById(parentMenu.getId());
-        AjaxResult data = new AjaxResult();
+        List<HashMap<String, List<Publication>>> list = new ArrayList<>();
         for (LibraryMenu menu : menuList) {
             List<Publication> publications = publicationMapper.selectPublicationListByAffiliation(menu.getTitle());
+            HashMap<String, List<Publication>> data = new HashMap<>();
             data.put(menu.getTitle(), publications);
+            list.add(data);
         }
 
-        return data;
+        return list;
     }
 
     /**

src/main/java/com/ruoyi/project/VRdemo/service/impl/RegionDevelopServiceImpl.java

@@ -66,16 +66,18 @@ public class RegionDevelopServiceImpl implements IRegionDevelopService {
      * @param regionDevelop 东南亚地区发展报告
      * @return 东南亚地区发展报告
      */
-    public AjaxResult selectRegionDevelopListByMenu(RegionDevelop regionDevelop) {
+    public List<HashMap<String, List<RegionDevelop>>> selectRegionDevelopListByMenu(RegionDevelop regionDevelop) {
         LibraryMenu parentMenu = libraryMenuMapper.selectLibraryMenuByModule("region_develop");
         List<LibraryMenu> menuList = libraryMenuMapper.selectChildMenuListById(parentMenu.getId());
-        AjaxResult data = new AjaxResult();
+        List<HashMap<String, List<RegionDevelop>>> list = new ArrayList<>();
         for (LibraryMenu menu : menuList){
             List<RegionDevelop> regionDevelops = regionDevelopMapper.selectRegionDevelopListByType(menu.getTitle());
+            HashMap<String, List<RegionDevelop>> data = new HashMap<>();
             data.put(menu.getTitle(), regionDevelops);
+            list.add(data);
         }
 
-        return data;
+        return list;
     }
 
     /**