From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java
index 7f1903a..93d9088 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java
@@ -1,5 +1,6 @@
package com.matrix.system.hive.action;
+import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.hive.action.util.QueryUtil;
@@ -44,6 +45,11 @@
public @ResponseBody
AjaxResult addOrModify(ShoppingGoodsCategory shoppingGoodsCategory) {
if (shoppingGoodsCategory.getId() != null) {
+
+ // 自己不能是自己的父节点
+ if (shoppingGoodsCategory.getParentId() != null && shoppingGoodsCategory.getParentId().equals(shoppingGoodsCategory.getId())) {
+ throw new GlobleException("父级不能是自己");
+ }
return modify(goodsCategoryService, shoppingGoodsCategory, "商品类型");
} else {
@@ -111,11 +117,12 @@
@RequestMapping(value = "/all")
public @ResponseBody
AjaxResult all(ShoppingGoodsCategory shoppingGoodsCategory) {
- SysUsers user = getMe();
- if(shoppingGoodsCategory.getShopId()==null){
- shoppingGoodsCategory.setShopId(user.getShopId());
- }
- shoppingGoodsCategory.setCompanyId(user.getCompanyId());
+// SysUsers user = getMe();
+// if(shoppingGoodsCategory.getShopId()==null){
+// shoppingGoodsCategory.setShopId(user.getShopId());
+// }
+// shoppingGoodsCategory.setCompanyId(user.getCompanyId());
+ QueryUtil.setQueryLimitCom(shoppingGoodsCategory);
return new AjaxResult(AjaxResult.STATUS_SUCCESS, goodsCategoryService.findByModel(shoppingGoodsCategory), 0);
}
--
Gitblit v1.9.1