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/ComActServiceImpl.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
index 724f734..6e29422 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -66,7 +66,13 @@
         }
         ComActDO comActDO = new ComActDO();
         Integer integer =
-            comActDAO.selectCount(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName, comActVO.getName()));
+            comActDAO.selectCount(new QueryWrapper<ComActDO>().lambda()
+                    .eq(ComActDO::getName, comActVO.getName())
+                    .eq(ComActDO::getCityCode,comActVO.getCityCode())
+                    .eq(ComActDO::getAreaCode,comActVO.getAreaCode())
+                    .eq(ComActDO::getProvinceCode,comActVO.getProvinceCode())
+                    .eq(ComActDO::getAppId,comActVO.getAppId())
+            );
         if (integer > 0) {
             return R.fail("社区已经存在");
         }
@@ -75,7 +81,9 @@
         int insert = comActDAO.insert(comActDO);
         if (insert > 0) {
             ComActDO comActDO1 =
-                comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName, comActVO.getName()));
+                comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda()
+                        .eq(ComActDO::getCommunityId, comActVO.getCommunityId())
+                );
             BeanUtils.copyProperties(comActDO1, comActVO);
             return R.ok(comActVO);
         }
@@ -336,13 +344,11 @@
     @Override
     public R statisticsPbMemberType(){
         List<ComPbMemberTypeVO> comPbMemberTypeVOS = comPbMemberDAO.statisticsPbMemberType();
-        Map<String, Integer> retMap = comPbMemberTypeVOS.stream().collect(Collectors.toMap(ComPbMemberTypeVO::getCountName, ComPbMemberTypeVO::getCountNum));
-        return R.ok(retMap);
+        return R.ok(comPbMemberTypeVOS);
     }
 
     public R selectUnitByNatureName(){
         List<ComPbMemberTypeVO> comPbMemberTypeVOS = comPbMemberDAO.selectUnitByNatureName();
-        Map<String, Integer> retMap = comPbMemberTypeVOS.stream().collect(Collectors.toMap(ComPbMemberTypeVO::getCountName, ComPbMemberTypeVO::getCountNum));
-        return R.ok(retMap);
+        return R.ok(comPbMemberTypeVOS);
     }
 }

--
Gitblit v1.7.1