From ba2555b05fcfaacd8c10bbe2cdf3d7e323566871 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 01 三月 2019 15:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
index 0165bbf..c8287b0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
@@ -443,6 +443,10 @@
}
String params = record.getParams();
+ if (params != null && params.trim().length() == 0) {
+ params = null;
+ }
+
if (!StringUtil.isNullOrEmpty(params)) {
String jumpValue = systemConfigService.get("jump");
@@ -451,17 +455,32 @@
}
params = jumpValue.replace("#", params);
- record.setParams(params);
}
if (!StringUtil.isNullOrEmpty(jumpType)) {
List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);
if (listByType !=null && listByType.size() > 0) {
- record.setJumpDetail(listByType.get(0));
+ resultObj.setJumpDetail(listByType.get(0));
}
}
- specialService.updateByPrimaryKeySelective(record);
+
+ String name = record.getName();
+ if (name != null && name.trim().length() == 0) {
+ name = null;
+ }
+
+ String remark = record.getRemark();
+ if (remark != null && remark.trim().length() == 0) {
+ remark = null;
+ }
+
+ resultObj.setName(name);
+ resultObj.setParams(params);
+ resultObj.setShowType(record.getShowType());
+ resultObj.setRemark(remark);
+
+ specialService.updateByPrimaryKey(resultObj);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
--
Gitblit v1.8.0