From 9651133228de3e319aaea7bd634cf7b24b20b28f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 04 九月 2023 13:36:16 +0800
Subject: [PATCH] 修改社区动态加载不出来
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 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 625fcf2..d21a6f0 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
@@ -98,7 +98,7 @@
Boolean isExpertCheck=false;
Long expertId=null;
Boolean isStretAccount = isStreetAccount(loginUserInfoVO);
-// comEvent.setAppId(loginUserInfoVO.getAppId());
+ comEvent.setAppId(loginUserInfoVO.getAppId());
if (nonNull(comEvent.getUserType())){
if (comEvent.getUserType().equals(1)){
//个人账号权限
@@ -146,13 +146,14 @@
IPage<ComEvent> list=null;
//是否为专家查看自己发布的事件
if (isExpertCheck && comEvent.getUserType()!=1){
- if (nonNull(comEventMapper.listEventIds(expertId))){
- list = comEventMapper.pageByComEventExpert(comEventMapper.listEventIds(expertId), comEvent, pagination);
+ List<Long> ids=comEventMapper.listEventIds(expertId);
+ if (ids!=null && ids.size()>0 ){
+ list = comEventMapper.pageByComEventExpert(ids, comEvent, pagination);
}
}else{
list = baseMapper.pageByComEvent(comEvent, pagination);
}
- if (list.getRecords().size() < 1) {
+ if (list==null || list.getRecords().size() < 1) {
return R.ok(Collections.emptyList());
}
list.getRecords().forEach(comEvent1 -> {
@@ -164,8 +165,8 @@
}
ComMediateType category = commediateTypeService.getById(comEvent1.getEventCategory());
comEvent1.setEventCategoryName(category.getName());
-// comEvent1.setHasPerm(hasPermission(comEvent1,loginUserInfoVO ));
-// this.accountMenu(comEvent1,comEvent.getUserType(),loginUserInfoVO,isStretAccount);
+ comEvent1.setHasPerm(hasPermission(comEvent1,loginUserInfoVO ));
+ this.accountMenu(comEvent1,comEvent.getUserType(),loginUserInfoVO,isStretAccount);
});
return R.ok(list);
}
@@ -961,8 +962,6 @@
}
}
-
-
@Override
@Transactional(rollbackFor = Exception.class)
public R acceptRequest(Long id, Long specterId) {
@@ -1015,7 +1014,12 @@
comEvent.setSpecialistId(expert.getId());
isExpertCheck=true;
expertId=expert.getId();
+// level=expert.getLevel();
+// id=expert.getCommunityId();
+ comEvent.setCommunityId(expert.getCommunityId());
}
+
+
}else if (loginUserInfoVO.getType().equals(12)){
//行业分中心权限
comEvent.setUserType(3);
@@ -1034,10 +1038,11 @@
List<Long> cids = comActDAO.selectCommunityByStreetId(loginUserInfoVO.getStreetId());
comEvent.setUserType(5);
comEvent.setCommunityIds(cids);
- }
+ }
if (isExpertCheck){
- if(nonNull(comEventMapper.listEventIds(expertId))){
- List<Long> eventIds = comEventMapper.listEventIds(expertId);
+ List<Long> eventIds = comEventMapper.listEventIds(expertId);
+ if(eventIds!=null && eventIds.size()>0){
+
//获取该专家的所有事件
comEvent.setEventIds(eventIds);
}
--
Gitblit v1.7.1