Commit 53db8309e994e2c95db289ed6ae2dec44d851c14
1 parent
6f42da1b
【修复】CRM 分类删除时,判断商品数量是否为空不正确的问题,导致无法删除分类
Showing
2 changed files
with
3 additions
and
3 deletions
yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
| @@ -87,7 +87,7 @@ public interface ErrorCodeConstants { | @@ -87,7 +87,7 @@ public interface ErrorCodeConstants { | ||
| 87 | ErrorCode PRODUCT_CATEGORY_USED = new ErrorCode(1_020_009_002, "产品分类已关联产品"); | 87 | ErrorCode PRODUCT_CATEGORY_USED = new ErrorCode(1_020_009_002, "产品分类已关联产品"); |
| 88 | ErrorCode PRODUCT_CATEGORY_PARENT_NOT_EXISTS = new ErrorCode(1_020_009_003, "父分类不存在"); | 88 | ErrorCode PRODUCT_CATEGORY_PARENT_NOT_EXISTS = new ErrorCode(1_020_009_003, "父分类不存在"); |
| 89 | ErrorCode PRODUCT_CATEGORY_PARENT_NOT_FIRST_LEVEL = new ErrorCode(1_020_009_004, "父分类不能是二级分类"); | 89 | ErrorCode PRODUCT_CATEGORY_PARENT_NOT_FIRST_LEVEL = new ErrorCode(1_020_009_004, "父分类不能是二级分类"); |
| 90 | - ErrorCode product_CATEGORY_EXISTS_CHILDREN = new ErrorCode(1_020_009_005, "存在子分类,无法删除"); | 90 | + ErrorCode PRODUCT_CATEGORY_EXISTS_CHILDREN = new ErrorCode(1_020_009_005, "存在子分类,无法删除"); |
| 91 | 91 | ||
| 92 | // ========== 商机状态 1_020_010_000 ========== | 92 | // ========== 商机状态 1_020_010_000 ========== |
| 93 | ErrorCode BUSINESS_STATUS_TYPE_NOT_EXISTS = new ErrorCode(1_020_010_000, "商机状态组不存在"); | 93 | ErrorCode BUSINESS_STATUS_TYPE_NOT_EXISTS = new ErrorCode(1_020_010_000, "商机状态组不存在"); |
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductCategoryServiceImpl.java
| @@ -110,10 +110,10 @@ public class CrmProductCategoryServiceImpl implements CrmProductCategoryService | @@ -110,10 +110,10 @@ public class CrmProductCategoryServiceImpl implements CrmProductCategoryService | ||
| 110 | validateProductCategoryExists(id); | 110 | validateProductCategoryExists(id); |
| 111 | // 1.2 校验是否还有子分类 | 111 | // 1.2 校验是否还有子分类 |
| 112 | if (productCategoryMapper.selectCountByParentId(id) > 0) { | 112 | if (productCategoryMapper.selectCountByParentId(id) > 0) { |
| 113 | - throw exception(product_CATEGORY_EXISTS_CHILDREN); | 113 | + throw exception(PRODUCT_CATEGORY_EXISTS_CHILDREN); |
| 114 | } | 114 | } |
| 115 | // 1.3 校验是否被产品使用 | 115 | // 1.3 校验是否被产品使用 |
| 116 | - if (crmProductService.getProductByCategoryId(id) !=null) { | 116 | + if (crmProductService.getProductByCategoryId(id) > 0) { |
| 117 | throw exception(PRODUCT_CATEGORY_USED); | 117 | throw exception(PRODUCT_CATEGORY_USED); |
| 118 | } | 118 | } |
| 119 | // 2. 删除 | 119 | // 2. 删除 |