From f89d34915bbe45da3a2ef41cdb501c7a8ed66276 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 21 Sep 2022 10:26:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 39cb8a42..e1f1d407 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ target/ application-dev.yml application-pro.yml +application-dem.yml application-prod.yml application-test.yml \ No newline at end of file From 6e0f1ade3850503820d72e1bb24677ffb3fdfa1b Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 21 Sep 2022 10:29:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=88=A0=E9=99=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/article/impl/ArticleCategoryServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java index 3e54652a..917f649e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java @@ -200,6 +200,13 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { Assert.notNull(model, "分类不存在"); + Article article = articleMapper.selectOne(new QueryWrapper
() + .eq("cid", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.isNull(article, "当前分类已被文章使用,请先移除!"); + model.setIsDelete(1); model.setDeleteTime(TimeUtil.timestamp()); articleCategoryMapper.updateById(model);