From 99081be70e456268640014a6369c55c5fec29f2d Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 28 Aug 2021 14:38:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index b54ec81..c91f9cf 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -347,12 +347,11 @@
* @return
*/
@PostMapping("/queryYearKh")
- public R queryYearKh(String jurisdiction, String deptid) {
+ public List queryYearKh(String jurisdiction, String deptid) {
Calendar cal = Calendar.getInstance();
String year = String.valueOf(cal.get(Calendar.YEAR));
- Map<String, String> map = informationService.queryYearKh(year, jurisdiction, deptid);
- map = (HashMap<String, String>) sortMapBykeyAsc(map);//key升序
- return R.data(map);
+ List list = informationService.queryYearKh(year, jurisdiction, deptid);
+ return list;
}
//升序
public static Map<String, String> sortMapBykeyAsc(Map<String, String> oriMap) {
--
Gitblit v1.9.3