From 4cb15e222cd7d099d533ccbeb7f9a8cd99bf180c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 十二月 2018 16:35:18 +0800
Subject: [PATCH] 替换原来老的资金详情

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
index 04136a4..2a60376 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
@@ -20,6 +20,7 @@
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.annotation.RequestNoLogin;
 
 import org.yeshi.utils.JsonUtil;
@@ -84,8 +85,11 @@
 				return;
 			}
 			
+			int pageSize = Constant.PAGE_SIZE;
+			
 			int count = configService.getCount(key, pageIndex);
-			PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count);
+			int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
 			
 			JSONObject data = new JSONObject();
 			data.put("pe", pe);
@@ -130,9 +134,20 @@
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
 				return;
 			}
-			// key 涓嶅彲淇敼
-			config.setKey(crentconfig.getKey());
-			configService.update(config);
+			
+			if (StringUtil.isNullOrEmpty(config.getName()) || StringUtil.isNullOrEmpty(config.getValue())) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇存槑銆佹湁鏁堝�间笉鑳戒负绌�"));
+				return;
+			}
+			
+			crentconfig.setName(config.getName());
+			crentconfig.setValue(config.getValue());
+			
+			if (!StringUtil.isNullOrEmpty(config.getBeizhu())) {
+				crentconfig.setBeizhu(config.getBeizhu());
+			}
+			
+			configService.update(crentconfig);
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
 			
 		} catch (Exception e) {

--
Gitblit v1.8.0