From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 a696575..3219754 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
@@ -79,14 +79,14 @@
@Override
public R pageByComEvent(ComEvent comEvent, Page pagination,LoginUserInfoVO loginUserInfoVO) {
- log.info("当前登陆的用户信息，用户类型"+loginUserInfoVO.getType()+"社区id"+loginUserInfoVO.getCommunityId());
+ log.info("=================当前登陆的用户信息，用户类型"+loginUserInfoVO.getType()+"社区id"+loginUserInfoVO.getCommunityId());
Boolean isExpertCheck=false;
Long expertId=null;
if (nonNull(comEvent.getUserType())){
if (comEvent.getUserType().equals(1)){
//个人账号权限
comEvent.setRequestUserId(loginUserInfoVO.getUserId());
- }else if (comEvent.getUserType().equals(2) || loginUserInfoVO.getType().equals(13)){
+ }else if (comEvent.getUserType().equals(2) || loginUserInfoVO.getType().equals(13) || loginUserInfoVO.getType().equals(11)){
ComSanshuoExpert expert=new ComSanshuoExpert();
//专家账号权限(小程序和后台)
if (nonNull(loginUserInfoVO.getPhone())){
@@ -115,9 +115,18 @@
comEvent.setCommunityId(loginUserInfoVO.getCommunityId());
}
}
+ if (nonNull(loginUserInfoVO.getAccount())){
+ if (loginUserInfoVO.getAccount().equals("admin")){
+ comEvent.setUserType(null);
+ }
+ }
IPage<ComEvent> list=null;
+ log.info("=====================当前的userType"+comEvent.getUserType());
+ log.info("=====================是否专家账号查看"+isExpertCheck);
if (isExpertCheck){
- list = comEventMapper.pageByComEventExpert(comEventMapper.listEventIds(expertId), comEvent, pagination);
+ if (nonNull(comEventMapper.listEventIds(expertId))){
+ list = comEventMapper.pageByComEventExpert(comEventMapper.listEventIds(expertId), comEvent, pagination);
+ }
}else{
list = baseMapper.pageByComEvent(comEvent, pagination);
}
@@ -311,8 +320,7 @@
comEvent.setCurrentOrgId("99999");
//生成一次流转记录
comEvent.setCurrentEventProcessResult("街道上报到区三说会堂");
- comEventTransferRecord.setFromId(comEvent.getSpecialistId());
- comEventTransferRecord.setToId(99999L);
+ comEventTransferRecord.setFromId(Long.parseLong(comEvent.getCurrentOrgId()));
comEventTransferRecord.setReportLevel(1);
comEvent.setReportLevel(1);
}else {
--
Gitblit v1.7.1