From ce3420676d9ccf4a2bdf87aeb7ad1494b5e5d26c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 09 四月 2022 14:42:26 +0800
Subject: [PATCH] 图片上传与邀请图完善
---
app/src/main/java/com/yeshi/makemoney/app/controller/admin/config/SystemConfigAdminController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/yeshi/makemoney/app/controller/admin/config/SystemConfigAdminController.java b/app/src/main/java/com/yeshi/makemoney/app/controller/admin/config/SystemConfigAdminController.java
index e8283b8..e2ef13e 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/controller/admin/config/SystemConfigAdminController.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/controller/admin/config/SystemConfigAdminController.java
@@ -36,7 +36,7 @@
@ResponseBody
@RequestMapping("list")
public String list(SystemConfigQuery query, int page, int limit, String callback) {
- List<SystemConfig> list = systemConfigService.listByType(SystemConfigType.common);
+ List<SystemConfig> list = systemConfigService.listByType(query.getType() == null ? SystemConfigType.common : query.getType());
long count = list.size();
JSONObject data = new JSONObject();
Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
@@ -93,10 +93,10 @@
@ResponseBody
@RequestMapping("getKeyList")
- public String getKeyList() {
+ public String getKeyList(SystemConfigType type) {
JSONArray array = new JSONArray();
for (SystemConfigKey key : SystemConfigKey.values()) {
- if (key.getType() == SystemConfigType.common) {
+ if (key.getType() == (type == null ? SystemConfigType.common : type)) {
JSONObject data = new JSONObject();
data.put("key", key.name());
data.put("value", key.getDesc());
--
Gitblit v1.8.0