From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
index bb3a4b8..129fdcb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
@@ -51,10 +51,10 @@
private BusinessSystemService businessSystemService;
@RequestMapping(value = "queryAll")
- public void listquery(String callback, PrintWriter out) {
+ public void listquery(String callback, Integer sex, PrintWriter out) {
try {
- List<GoodsClass> goodsClassList = goodsClassService.listquery();
+ List<GoodsClass> goodsClassList = goodsClassService.listquery(sex);
if (goodsClassList == null || goodsClassList.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
@@ -96,6 +96,8 @@
@RequestMapping(value = "save")
public void save(String callback, GoodsClass goodsClass, String jumpType, HttpServletRequest request,
PrintWriter out) {
+ if (goodsClass.getTaobaoCids() != null)
+ goodsClass.setTaobaoCids(goodsClass.getTaobaoCids().replace("锛�", ","));
try {
// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
if (request instanceof MultipartHttpServletRequest) {
--
Gitblit v1.8.0