From 705a7a7d8f03caf1923f9813c83aca3b6a9a6456 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 18 十月 2022 15:01:34 +0800
Subject: [PATCH] 三说会堂事件操作权限处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
index 9af9c1f..ed7e236 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -85,8 +85,6 @@
@Override
public R pageByComEvent(ComEvent comEvent, Page pagination,LoginUserInfoVO loginUserInfoVO) {
- log.info("=================当前登陆的用户信息，用户类型"+loginUserInfoVO.getType()+"社区id"+loginUserInfoVO.getCommunityId());
- log.info("=====================当前的userType1:="+comEvent.getUserType());
Boolean isExpertCheck=false;
Long expertId=null;
Boolean isStretAccount = isStreetAccount(loginUserInfoVO);
@@ -135,8 +133,6 @@
}
}
IPage<ComEvent> list=null;
- log.info("=====================当前的userType2:="+comEvent.getUserType());
- log.info("=====================是否专家账号查看"+isExpertCheck);
//是否为专家查看自己发布的事件
if (isExpertCheck && comEvent.getUserType()!=1){
if (nonNull(comEventMapper.listEventIds(expertId))){
@@ -860,7 +856,7 @@
Boolean isStretAccount = isStreetAccount(loginUserInfoVO);
if (loginUserInfoVO.getType().equals(13) || loginUserInfoVO.getType().equals(11)){
ComSanshuoExpert expert=new ComSanshuoExpert();
- //专家账号权限(后台)
+ //专家后台账号
if (nonNull(loginUserInfoVO.getPhone())){
expert = comSanShuoExpertService.getOne(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getPhone, loginUserInfoVO.getPhone()));
}else{
@@ -892,16 +888,19 @@
comEvent.setUserType(5);
comEvent.setCommunityIds(cids);
}
- if (isExpertCheck && comEvent.getUserType()!=1){
+ if (isExpertCheck){
if (nonNull(comEventMapper.listEventIds(expertId))){
List<Long> eventIds = comEventMapper.listEventIds(expertId);
+ //获取该专家的所有事件
comEvent.setEventIds(eventIds);
-
}
}
+ if (nonNull(loginUserInfoVO.getStreetId())){
+ log.info("=============当前账号的街道="+loginUserInfoVO.getStreetId());
+ }
if (nonNull(loginUserInfoVO.getAccount())){
- if (loginUserInfoVO.getAccount().equals("admin") && loginUserInfoVO.getStreetId().equals(Constants.ADMIN_STREET_ID)){
- comEvent.setUserType(null);
+ if (loginUserInfoVO.getAccount().equals("admin")){
+ comEvent.setUserType(9);
}
}
List<ComEventCalculateVO> calculateList = baseMapper.calculate(comEvent);
--
Gitblit v1.7.1