Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

 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 {
@@ -116,8 +122,6 @@
//            shoppingGoodsCategory.setShopId(user.getShopId());
//        }
//        shoppingGoodsCategory.setCompanyId(user.getCompanyId());
        SysShopInfo zbShop = shopInfoDao.selectZbShop(getMe().getCompanyId());
        shoppingGoodsCategory.setShopId(zbShop.getId());
        QueryUtil.setQueryLimitCom(shoppingGoodsCategory);
        return new AjaxResult(AjaxResult.STATUS_SUCCESS, goodsCategoryService.findByModel(shoppingGoodsCategory), 0);
    }