From 98585c253e4a5c538a634f18ed24400948f582c5 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 09 十一月 2022 14:28:01 +0800
Subject: [PATCH] 普达纠纷管理,物业公司接口处理

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index bbab1d7..37e0173 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1354,6 +1354,9 @@
                 this.putMenuRole(menuRoleVO);
             }
         }
+        if (administratorsUserVO.getType().equals(20)){
+            roleId=1559112102373756548L;
+        }
         SysRoleDO roleDO = roleDAO.selectById(roleId);
         if (ObjectUtils.isEmpty(roleDO)) {
             return R.fail("角色不存在");
@@ -3707,6 +3710,27 @@
     }
 
     @Override
+    public R getAllCommunityList() {
+        List<Integer> areaList = areaCodeList();
+        List<AreaVOS> areaVOList = new ArrayList<>();
+        for (Integer code : areaList) {
+            AreaVOS areaVO = new AreaVOS();
+            areaVO.setId(code);
+            areaVO.setName(areaCodeToName(code.longValue()));
+            List<StreetVOS> streetVOS = userDao.selectStreetByAreaCode(code);
+            Iterator<StreetVOS> iterator = streetVOS.listIterator();
+            while (iterator.hasNext()) {
+                StreetVOS vo = iterator.next();
+                List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(vo.getId(), 3);
+                vo.setChildList(communityVOS);
+
+            }
+            areaVO.setChildList(streetVOS);
+            areaVOList.add(areaVO);
+        }
+        return R.ok(areaVOList);
+    }
+    @Override
     public R getCommunityList(String name, Long id) {
         //区级账号名
         String[] streetList = {"bingcaogangjiedao", "donghuajiedao", "nongnongpingjiedao", "dadukoujiedaojiedao", "guazipingjiedao",
@@ -3714,7 +3738,7 @@
                 "jingjiangzhen", "renhezhen", "pingdizhen", "datianzhen", "tongdezhen", "futianzhen", "qianjinzhen", "panlianzhen", "binguzhen", "baimazhen",
                 "salianzhen", "puweizhen", "deshizhen", "wanqiuyizuxiang", "caochangzhen", "xinshanlisuzuxiang", "tongzilinzhen", "yongxingzhen", "yumenzhen",
                 "honggezhen", "hongguoyizuxiang"};
-        List<Integer> ids = userDao.selectIdsByAccount(streetList);
+//        List<Integer> ids = userDao.selectIdsByAccount(streetList);
         //村或社区账号
         Integer type = isVilliage(name);
         //是否为市级账号

--
Gitblit v1.7.1