From 8c79179d0031125a956c0e5c4bf8d92c29b663e2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 11 十月 2022 14:54:59 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 92d09dc..8e052c8 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
@@ -101,7 +101,10 @@
// }
ComMediateType category = commediateTypeService.getById(comEvent1.getEventCategory());
comEvent1.setEventCategoryName(category.getName());
- comEvent1.setExpertAvatar(comSanShuoExpertService.getById(comEvent1.getSpecialistId()).getAvatar());
+ ComSanshuoExpert byId = comSanShuoExpertService.getById(comEvent1.getSpecialistId());
+ if (nonNull(byId)){
+ comEvent1.setExpertAvatar(byId.getAvatar());
+ }
});
return R.ok(list);
}
@@ -293,6 +296,14 @@
map.put("archiveLog", comEventTransferRecord);
}
});
+ //迭代器迭代删除归档记录
+ Iterator<ComEventTransferRecord> iterator = transferRecord.iterator();
+ while (iterator.hasNext()){
+ ComEventTransferRecord comEventTransferRecord = iterator.next();
+ if (comEventTransferRecord.getEventStatus().equals(7)){
+ iterator.remove();
+ }
+ }
map.put("transferLog", transferRecord);
List<ComEventResource> resource = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, id)
.eq(ComEventResource::getStatus, 5));
--
Gitblit v1.7.1