From b4e124d37e333194c63ddcdaa6e8cb447a72c153 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 13 十月 2022 10:05:01 +0800
Subject: [PATCH] 三说会堂事件流程处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 83c6730..482b836 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
@@ -86,7 +86,7 @@
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,11 +115,16 @@
comEvent.setCommunityId(loginUserInfoVO.getCommunityId());
}
}
+ 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);
}
@@ -313,8 +318,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