From fc9a5959e125d4f390a2a0940a278bfaa72ecb1d Mon Sep 17 00:00:00 2001
From: zhangtiansen <1292933220@qq.com>
Date: 星期三, 19 十月 2022 22:33:58 +0800
Subject: [PATCH] update

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java |   46 +++++++++++++++++++++-------------------------
 1 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
index 8064342..d027f9f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
@@ -179,7 +179,7 @@
         if (loginUserInfo.getAccount().equals("admin")){
             //三说会堂查看所有专家
             id=null;
-            range=null;
+            range=1;
         }
         IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level);
         for (ComSanshuoExpertVO record : comSanshuoExpertVOIPage.getRecords()) {
@@ -274,34 +274,30 @@
                 vo.setId(comSanshuoIndustryCenterDao.selectOne(new QueryWrapper<ComSanshuoIndustryCenter>().lambda().eq(ComSanshuoIndustryCenter::getAccount, loginUserInfo.getAccount())).getId());
                 list.add(vo);
                 return R.ok(list);
-            }else if (nonNull(loginUserInfo.getUserType())){
-                if (loginUserInfo.getUserType().equals(1)){
-                    //街道账号
-                    ComStreetDO comStreetDO = comStreetDAO.selectById(loginUserInfo.getStreetId());
-                    List<ExpertRangeVO> list=new ArrayList<>();
-                    ExpertRangeVO vo=new ExpertRangeVO();
-                    vo.setLevel(3);
-                    vo.setName(comStreetDO.getName()+"调解站");
-                    vo.setId(loginUserInfo.getStreetId());
-                    list.add(vo);
-                    return R.ok(list);
-                }
-                if (loginUserInfo.getUserType().equals(2)){
-                    //街道账号
-                    ComActDO comActDO = comActDAO.selectById(loginUserInfo.getCommunityId());
-                    List<ExpertRangeVO> list=new ArrayList<>();
-                    ExpertRangeVO vo=new ExpertRangeVO();
-                    vo.setLevel(4);
-                    vo.setName(comActDO.getName()+"调解站");
-                    vo.setId(loginUserInfo.getCommunityId());
-                    list.add(vo);
-                    return R.ok(list);
-                }
+            }else if (loginUserInfo.getType().equals(3)) {
+                //社区账号
+                ComActDO comStreetDO = comActDAO.selectById(loginUserInfo.getCommunityId());
+                List<ExpertRangeVO> list = new ArrayList<>();
+                ExpertRangeVO vo = new ExpertRangeVO();
+                vo.setLevel(4);
+                vo.setName(comStreetDO.getName() + "调解站");
+                vo.setId(loginUserInfo.getCommunityId());
+                list.add(vo);
+                return R.ok(list);
+            } else if (loginUserInfo.getType().equals(7)){
+                //街道账号
+                ComStreetDO comActDO = comStreetDAO.selectById(loginUserInfo.getStreetId());
+                List<ExpertRangeVO> list=new ArrayList<>();
+                ExpertRangeVO vo=new ExpertRangeVO();
+                vo.setLevel(4);
+                vo.setName(comActDO.getName()+"调解站");
+                vo.setId(loginUserInfo.getStreetId());
+                list.add(vo);
+                return R.ok(list);
             }
         }
         return R.fail();
     }
-
 
     /**
      * 小程序获取专家列表

--
Gitblit v1.7.1