From e955e44015d7dd9bce2bf932b28812045c908206 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 13 十月 2022 13:31:17 +0800
Subject: [PATCH] 三说会堂事件流程处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 482b836..10bf657 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
@@ -115,8 +115,10 @@
comEvent.setCommunityId(loginUserInfoVO.getCommunityId());
}
}
- if (loginUserInfoVO.getAccount().equals("admin")){
- comEvent.setUserType(null);
+ if (nonNull(loginUserInfoVO.getAccount())){
+ if (loginUserInfoVO.getAccount().equals("admin")){
+ comEvent.setUserType(null);
+ }
}
IPage<ComEvent> list=null;
log.info("=====================当前的userType"+comEvent.getUserType());
@@ -147,10 +149,32 @@
if(nonNull(archiveRecord)){
comEvent1.setIsArchive(0);
}
+ comEvent1.setHasPerm(hasPermission(comEvent1,loginUserInfoVO ));
});
return R.ok(list);
}
+ /**
+ * 当前账号是否有操作事件权限
+ * */
+ public Integer hasPermission(ComEvent comEvent,LoginUserInfoVO sysUser){
+ String account="";
+ Integer perm=1;
+ if (nonNull(sysUser.getAccount())){
+ account=sysUser.getAccount();
+ }
+ //上报级别是否匹配当前账号级别
+ if (sysUser.getType().equals(12) ){
+ if (!comEvent.getCurrentProcessType().equals(1)){
+ perm=0;
+ }
+ }else if (account.equals("admin")){
+ if (!comEvent.getCurrentProcessType().equals(4)){
+ perm=0;
+ }
+ }
+ return perm;
+ }
@Override
public List<ComEvent> listByComEvent(ComEvent comEvent,LoginUserInfoVO loginUserInfoVO) {
List<ComEvent> list = baseMapper.listByComEvent(comEvent,null);
@@ -271,6 +295,8 @@
//上报到社区
//查询社区账号，由专家转交到社区
comEvent.setCurrentProcessType(2);
+ comEvent.setSpecialistName("待分配");
+ comEvent.setSpecialistId(99999L);
ComActDO comActDO = comActDAO.selectById(expert.getCommunityId());
comEvent.setCurrentOrgId(comActDO.getStreetId().toString());
//生成一次流转记录
@@ -283,6 +309,8 @@
//上报到行业分中心
comEvent.setCurrentProcessType(1);
comEvent.setCurrentOrgId(expert.getIndustryCenterId().toString());
+ comEvent.setSpecialistName("待分配");
+ comEvent.setSpecialistId(99999L);
//生成一次流转记录
comEvent.setCurrentEventProcessResult("专家上报到行业分中心");
comEventTransferRecord.setFromId(comEvent.getSpecialistId());
--
Gitblit v1.7.1