From 04f09e52ffd4681bdfd85e51acd3da0d1280c3d3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 四月 2022 16:07:10 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/controller/admin/api/ConfigController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/admin/api/ConfigController.java b/src/main/java/com/yeshi/buwan/controller/admin/api/ConfigController.java
index 3ed11a1..3a8a2c1 100644
--- a/src/main/java/com/yeshi/buwan/controller/admin/api/ConfigController.java
+++ b/src/main/java/com/yeshi/buwan/controller/admin/api/ConfigController.java
@@ -1,22 +1,19 @@
package com.yeshi.buwan.controller.admin.api;
-import java.io.PrintWriter;
-import java.util.List;
-
-import javax.annotation.Resource;
-
+import com.yeshi.buwan.domain.system.DetailSystemConfig;
+import com.yeshi.buwan.service.imp.DetailSystemConfigService;
import com.yeshi.buwan.util.EHCacheManager;
import com.yeshi.buwan.util.JsonUtil;
import com.yeshi.buwan.util.StringUtil;
-import com.yeshi.buwan.util.SystemUtil;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import com.yeshi.buwan.domain.system.DetailSystemConfig;
-import com.yeshi.buwan.service.imp.DetailSystemConfigService;
+import javax.annotation.Resource;
+import java.io.PrintWriter;
+import java.util.List;
@Controller
@RequestMapping("admin/new/api/config")
@@ -28,9 +25,14 @@
private EHCacheManager ehCacheManager;
@RequestMapping("configList")
- public void configList(Long detailSystemId, String key, PrintWriter out) {
+ public void configList(Long detailSystemId, String key, String type, PrintWriter out) {
key = StringUtil.isNullOrEmpty(key) ? "" : key.trim();
- List<DetailSystemConfig> list = configService.listConfig(detailSystemId, key);
+ List<DetailSystemConfig> list = null;
+ if ("value".equalsIgnoreCase(type)) {
+ list = configService.listConfigByValue(detailSystemId, key);
+ } else {
+ list = configService.listConfig(detailSystemId, key);
+ }
JSONObject json = new JSONObject();
json.put("code", "0");
JSONArray listJson = new JSONArray(list);
--
Gitblit v1.8.0