From aa0131b1efb96c9f52371160b3a1e6823db3656a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 07 十二月 2023 13:02:26 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysClassificationServiceImpl.java |   10 +++++++---
 1 files changed, 7 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 b3582e3..b4d80a5 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);
     }
 
     /**
@@ -147,7 +150,8 @@
         LambdaQueryWrapper<SysClassification> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysClassification::getDelFlag,0)
                 .eq(SysClassification::getClassType,classType)
-                .orderByDesc(SysClassification::getClassSort);
+                .orderByDesc(SysClassification::getClassSort)
+                .orderByDesc(SysClassification::getCreateTime);
         List<SysClassification> sysClassificationList = this.list(queryWrapper);
         List<AppClassListVo> classListVos = sysClassificationList.stream().map(sysClassification ->{
             AppClassListVo appClassListVo = new AppClassListVo();

--
Gitblit v1.7.1