From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 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 9277356..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
@@ -6,8 +6,6 @@
import java.util.List;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONObject;
@@ -23,8 +21,8 @@
import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.bus.homemodule.SpecialCard;
import com.yeshi.fanli.entity.bus.homemodule.SuperSpecialCard;
-import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.common.JumpDetailV2;
+import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
@@ -35,8 +33,6 @@
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 com.yeshi.fanli.entity.system.System;
@Controller
@RequestMapping("admin/new/api/v1/specialcard")
@@ -429,7 +425,6 @@
* @param record
* @param out
*/
- @RequestNoLogin()
@RequestMapping(value = "modifySpecial")
public void modifySpecial(String callback, Special record, String jumpType, PrintWriter out) {
@@ -448,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");
@@ -456,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("淇濆瓨鎴愬姛"));
@@ -485,20 +499,9 @@
* @param response
* @param out
*/
- @RequestNoLogin()
@RequestMapping(value = "saveSpecial")
- public void saveSpecial(@RequestParam("file") CommonsMultipartFile file, Long uid,
- Long id, Long cardId, HttpServletRequest request, HttpServletResponse response, PrintWriter out) {
-
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "*");
-
- AdminUser admin = adminUserService.selectByPrimaryKey(uid);
-
- if (admin == null) {
- out.print(JsonUtil.loadFalseResult("褰撳墠璐︽埛楠岃瘉澶辫触"));
- return;
- }
+ public void saveSpecial(@RequestParam("file") CommonsMultipartFile file, Long id, Long cardId,
+ PrintWriter out) {
if (file == null) {
out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓虹┖"));
--
Gitblit v1.8.0