From b97f8e4afd4c01ad4805a0f04f23af0ed5b8fab0 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期四, 22 十一月 2018 11:14:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java
index ccf8a90..c07828c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java
@@ -386,7 +386,8 @@
try {
- systemClientParamsService.addSystemClientParams(systemClientParams, null);
+ systemClientParamsService.saveAdd(systemClientParams, list);
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
} catch (Exception e) {
@@ -417,8 +418,8 @@
try {
List<SystemClientParams> list =
- systemClientParamsService.getSystemClientParamsBySystemId(systemClientParams.getId());
- if (list == null) {
+ systemClientParamsService.getById(systemClientParams.getId());
+ if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
return;
}
--
Gitblit v1.8.0