From 10887d2e345348d1870069ee37a42c85d941a102 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 14 十二月 2021 15:52:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientServiceCategoryServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientServiceCategoryServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientServiceCategoryServiceImpl.java
index c85f04f..d6adbf8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientServiceCategoryServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientServiceCategoryServiceImpl.java
@@ -68,6 +68,10 @@
if (isNull(convenientServiceCategoryDO)) {
return R.fail("分类id不存在");
}
+ int count = this.baseMapper.checkCategoryIsUsing(categoryId);
+ if (count > 0) {
+ return R.fail("该分类名称已被引用，无法删除！");
+ }
convenientServiceCategoryDO.setIsDel(true);
convenientServiceCategoryDO.setUpdatedBy(operator);
int result = this.baseMapper.updateById(convenientServiceCategoryDO);
@@ -114,4 +118,9 @@
}
return R.ok(categoryVOList);
}
+
+ @Override
+ public R getSuitableServiceCategories(Long communityId) {
+ return R.ok(this.baseMapper.selectSuitableServiceCategories(communityId));
+ }
}
--
Gitblit v1.7.1