From 7fd94101a76b68c20f6cd7a041154f6c35a77ede Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 23 Nov 2020 16:10:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=AE=A1=E6=A0=B8=E5=8E=86?= =?UTF-8?q?=E5=8F=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IssueApplicationHistoryServiceImpl.java | 7 +++++-- .../main/resources/mapper/IssueApplicationHistoryDao.xml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java index 97c20b3352..7caa252331 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.dao.IssueApplicationHistoryDao; import com.epmet.dto.IssueApplicationHistoryDTO; import com.epmet.dto.form.ApplicationDetailWorkFormDTO; import com.epmet.dto.form.ApplicationHistoryWorkFormDTO; +import com.epmet.dto.form.UserIdsFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IssueApplicationHistoryEntity; import com.epmet.feign.EpmetUserOpenFeignClient; @@ -161,11 +162,13 @@ public class IssueApplicationHistoryServiceImpl extends BaseServiceImpl(); } List userIds = result.stream().map(m -> m.getUserId()).collect(Collectors.toList()); - Result> listResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIds); + UserIdsFormDTO form = new UserIdsFormDTO(); + form.setUserIds(userIds); + Result> listResult = epmetUserOpenFeignClient.getStaffInfoList(form); if (!listResult.success()){ throw new RenException("议题审核历史查询用户基本信息失败......"); } - result.forEach(r -> listResult.getData().stream().filter(u -> r.getUserId().equals(u.getUserId())).forEach(u -> r.setStaffName(u.getRealName()))); + result.forEach(r -> listResult.getData().stream().filter(u -> r.getUserId().equals(u.getStaffId())).forEach(u -> r.setStaffName(u.getStaffName()))); return result; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml index 76c12d7381..33da8566ba 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml @@ -25,7 +25,7 @@ iah.ID AS historyId, iah.ACTION_TYPE, UNIX_TIMESTAMP(iah.CREATED_TIME) AS operateTime, - iah.REASON, + IFNULL(iah.REASON,'') AS reason, iah.CREATED_BY AS userId FROM issue_application_history iah LEFT JOIN issue_application ia ON ia.ID = iah.ISSUE_APPLICATION_ID