From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientServiceCategoryServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 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 c3a7544..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
@@ -22,8 +22,6 @@
 import com.panzhihua.service_community.model.dos.ConvenientServiceCategoryDO;
 import com.panzhihua.service_community.service.ConvenientServiceCategoryService;
 
-import javax.annotation.Resource;
-
 /**
  * @title: ConvenientServiceCategoryServiceImpl
  * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
@@ -72,7 +70,7 @@
         }
         int count = this.baseMapper.checkCategoryIsUsing(categoryId);
         if (count > 0) {
-            return R.fail("分类已被引用,无法删除");
+            return R.fail("该分类名称已被引用,无法删除!");
         }
         convenientServiceCategoryDO.setIsDel(true);
         convenientServiceCategoryDO.setUpdatedBy(operator);
@@ -107,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,4 +118,9 @@
         }
         return R.ok(categoryVOList);
     }
+
+    @Override
+    public R getSuitableServiceCategories(Long communityId,String areaCode) {
+        return R.ok(this.baseMapper.selectSuitableServiceCategories(communityId,areaCode));
+    }
 }

--
Gitblit v1.7.1