From 34fcf32a24d06befd53c6e05ae9c41a4de24e71b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 15 七月 2021 10:00:00 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 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 2b5bb1c..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);
@@ -194,6 +210,7 @@
records.forEach(comActMessageVO1 -> {
Long id = comActMessageVO1.getId();
List<ComActMessageBackVO> list = comActMessageDAO.selectMsgBackList(id);
+
comActMessageVO1.setBackList(list);
});
iPage.setRecords(records);
--
Gitblit v1.7.1