From 8009e63d71d0cce17c64c70852119ac4a9d71c4d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 18 十月 2022 14:16:36 +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 | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 433b298..0566827 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
@@ -12,6 +12,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.constants.ReturnMsgConstants;
import com.panzhihua.common.enums.SanShuoEventStatusEnum;
import com.panzhihua.common.model.dtos.community.sanshuo.IndexDateDTO;
@@ -85,7 +86,7 @@
@Override
public R pageByComEvent(ComEvent comEvent, Page pagination,LoginUserInfoVO loginUserInfoVO) {
log.info("=================当前登陆的用户信息，用户类型"+loginUserInfoVO.getType()+"社区id"+loginUserInfoVO.getCommunityId());
- log.info("=====================当前的userType1"+comEvent.getUserType());
+ log.info("=====================当前的userType1:="+comEvent.getUserType());
Boolean isExpertCheck=false;
Long expertId=null;
Boolean isStretAccount = isStreetAccount(loginUserInfoVO);
@@ -128,13 +129,13 @@
comEvent.setCommunityIds(cids);
}
}
-// if (nonNull(loginUserInfoVO.getAccount())){
-// if (loginUserInfoVO.getAccount().equals("admin")){
-// comEvent.setUserType(null);
-// }
-// }
+ if (nonNull(loginUserInfoVO.getAccount())){
+ if (loginUserInfoVO.getAccount().equals("admin") && loginUserInfoVO.getStreetId().equals(Constants.ADMIN_STREET_ID)){
+ comEvent.setUserType(null);
+ }
+ }
IPage<ComEvent> list=null;
- log.info("=====================当前的userType2"+comEvent.getUserType());
+ log.info("=====================当前的userType2:="+comEvent.getUserType());
log.info("=====================是否专家账号查看"+isExpertCheck);
//是否为专家查看自己发布的事件
if (isExpertCheck && comEvent.getUserType()!=1){
@@ -439,8 +440,14 @@
comEvent.setChangeExpert(0);
comEvent.setConciliation(0);
}
- }else{
+ }else if (comEvent.getCurrentProcessType().equals(4)){
//未上报到街道，仅查看
+ comEvent.setSolve(0);
+ comEvent.setDistribution(0);
+ comEvent.setChangeExpert(0);
+ comEvent.setConciliation(0);
+
+ }else {
comEvent.setArchive(0);
comEvent.setSolve(0);
comEvent.setDistribution(0);
@@ -850,7 +857,6 @@
@Override
public R calculate(LoginUserInfoVO loginUserInfoVO) {
ComEvent comEvent=new ComEvent();
- comEvent.setUserType(3);
Boolean isExpertCheck=false;
Long expertId=null;
Boolean isStretAccount = isStreetAccount(loginUserInfoVO);
@@ -896,7 +902,7 @@
}
}
if (nonNull(loginUserInfoVO.getAccount())){
- if (loginUserInfoVO.getAccount().equals("admin")){
+ if (loginUserInfoVO.getAccount().equals("admin") && loginUserInfoVO.getStreetId().equals(Constants.ADMIN_STREET_ID)){
comEvent.setUserType(null);
}
}
--
Gitblit v1.7.1