From 6c4db89ea8795d6be8431f698051e62bec9ec956 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期五, 07 五月 2021 09:06:08 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java
index cf51e9d..2934883 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java
@@ -154,6 +154,22 @@
records.forEach(comActMessageVO1 -> {
Long id = comActMessageVO1.getId();
List<ComActMessageBackVO> list = comActMessageDAO.selectMsgBackList(id);
+ if(list!=null&& list.size()>0) {
+ list.forEach(vo -> {
+ Long type = comActMessageVO1.getType();
+ if (type == 1) {
+ ComPbServiceTeamVO team = comActMessageDAO.selectComPbServiceTeamById(comActMessageVO1.getSendtoUserId());
+ if (!ObjectUtils.isEmpty(team)) {
+ vo.setUserJob(team.getJob());
+ }
+ } else if (type == 2) {
+ PartyCommitteeVO party = comActMessageDAO.selectPartyCommitteeById(comActMessageVO1.getSendtoUserId());
+ if (!ObjectUtils.isEmpty(party)) {
+ vo.setUserJob(party.getPosition());
+ }
+ }
+ });
+ }
comActMessageVO1.setBackList(list);
});
iPage.setRecords(records);
--
Gitblit v1.7.1