From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysClassificationServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysClassificationServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysClassificationServiceImpl.java
index 03763f4..ae75193 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysClassificationServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysClassificationServiceImpl.java
@@ -127,12 +127,15 @@
public void deleteClassification(Long classId){
SysClassification sysClassification = this.getById(classId);
sysClassification.setDelFlag(1);
- this.saveOrUpdate(sysClassification);
if(sysClassification.getClassType()==1){
articleService.deleteArticleClass(classId);
}else if(sysClassification.getClassType()==2){
- remoteGoodsService.deleteGoodsClass(classId);
+ List<String> goodsNameList = remoteGoodsService.listGoodsNameByGoodsClass(classId).getData();
+ if(goodsNameList!=null&&goodsNameList.size()>0){
+ throw new ServiceException("无法删除,该分类下还有关联商品-"+goodsNameList.toString());
+ }
}
+ this.saveOrUpdate(sysClassification);
}
/**
@@ -176,7 +179,7 @@
}
}
if(mgtClassNumDto.getSubClassId()!=null){
- SysClassification subSysClassification = this.getById(mgtClassNumDto.getAddClassId());
+ SysClassification subSysClassification = this.getById(mgtClassNumDto.getSubClassId());
if(subSysClassification!=null){
subSysClassification.setRelationNum(subSysClassification.getRelationNum()-1);
this.saveOrUpdate(subSysClassification);
--
Gitblit v1.7.1