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/GoodsSubClassLabelAdminController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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..1896322 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
@@ -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