From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java
index c1ce9ac..9eebc47 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java
@@ -16,7 +16,7 @@
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabel;
-import com.yeshi.fanli.exception.GoodsClassException;
+import com.yeshi.fanli.exception.goods.GoodsClassException;
import com.yeshi.fanli.service.inter.clazz.GoodsSubClassLabelService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.StringUtil;
@@ -32,6 +32,7 @@
/**
* 鏍囩鍒楄〃
+ *
* @param callback
* @param classId
* @param pageIndex
@@ -66,7 +67,7 @@
*/
@RequestMapping(value = "saveLabel")
public void save(String callback, GoodsSubClassLabel label, HttpServletRequest request, PrintWriter out) {
- if (StringUtil.isNullOrEmpty(label.getName()) || label.getGoodsClass() == null) {
+ if (StringUtil.isNullOrEmpty(label.getName()) || label.getGoodsClass() == null || label.getOrderBy() == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏁版嵁涓嶅畬鏁�"));
return;
}
@@ -79,7 +80,14 @@
label.setCreateTime(new Date());
try {
- goodsSubClassLabelService.addSubClassLabel(label);
+ String[] names = label.getName().replace("锛�", ",").split(",");
+ int orderBy = label.getOrderBy();
+ for (String name : names) {
+ label.setId(null);
+ label.setOrderBy(orderBy++);
+ label.setName(name);
+ goodsSubClassLabelService.addSubClassLabel(label);
+ }
} catch (GoodsClassException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
}
--
Gitblit v1.8.0