From c93e76c57a98e35abbf62d2f514d9ba51efd3243 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期一, 21 八月 2023 19:03:55 +0800 Subject: [PATCH] bug --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysClassificationServiceImpl.java | 11 ++++++++--- 1 files changed, 8 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 cee57f2..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); } /** @@ -146,7 +149,9 @@ public List<AppClassListVo> listByType(Integer classType){ LambdaQueryWrapper<SysClassification> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SysClassification::getDelFlag,0) - .eq(SysClassification::getClassType,classType); + .eq(SysClassification::getClassType,classType) + .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