From ed1eaf43a06591a3c8c74806eec00e1afc362543 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 30 三月 2022 17:55:44 +0800
Subject: [PATCH] 党建相关bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientServiceCategoryServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 d242ed2..187497c 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
@@ -70,7 +70,7 @@
}
int count = this.baseMapper.checkCategoryIsUsing(categoryId);
if (count > 0) {
- return R.fail("分类已被引用，无法删除");
+ return R.fail("该分类名称已被引用，无法删除！");
}
convenientServiceCategoryDO.setIsDel(true);
convenientServiceCategoryDO.setUpdatedBy(operator);
@@ -105,10 +105,10 @@
}
@Override
- public R getAllServiceCategories() {
+ public R getAllServiceCategories(String areaCode) {
List<ConvenientServiceCategoryVO> categoryVOList = new ArrayList<>();
List<ConvenientServiceCategoryDO> categoryDOS = this.baseMapper.selectList(new QueryWrapper<ConvenientServiceCategoryDO>()
- .lambda().orderByDesc(ConvenientServiceCategoryDO::getWeight));
+ .lambda().eq(ConvenientServiceCategoryDO::getAreaCode,areaCode).orderByDesc(ConvenientServiceCategoryDO::getWeight));
if (!ObjectUtils.isEmpty(categoryDOS)) {
categoryDOS.forEach(categoryDO -> {
ConvenientServiceCategoryVO categoryVO = new ConvenientServiceCategoryVO();
@@ -120,7 +120,7 @@
}
@Override
- public R getSuitableServiceCategories(Long communityId) {
- return R.ok(this.baseMapper.selectSuitableServiceCategories(communityId));
+ public R getSuitableServiceCategories(Long communityId,String areaCode) {
+ return R.ok(this.baseMapper.selectSuitableServiceCategories(communityId,areaCode));
}
}
--
Gitblit v1.7.1