From b084d3277cf3d0dfa93ed0c890cd1f3ccf566602 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 27 Aug 2021 15:35:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8A=A0=E8=BF=94?= =?UTF-8?q?=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dto/epmetuser/result/ListStaffResultDTO.java | 2 ++ .../service/epmetuser/impl/EpmetUserServiceImpl.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java index d9fe352c1e..b465f8ec3e 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java @@ -13,6 +13,8 @@ import java.util.List; public class ListStaffResultDTO implements Serializable { private static final long serialVersionUID = 7129564173128153335L; + //工作人员所属组织Id + private String agencyId = ""; //工作人员用户id private String staffId = ""; //工作人员姓名 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 9188197a25..ab72a11410 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -457,7 +457,10 @@ public class EpmetUserServiceImpl implements EpmetUserService { List orgList = govOrgService.getStaffOrgName(staffIdList); //3.封装数据并返回 - resultList.forEach(re -> orgList.stream().filter(l -> re.getStaffId().equals(l.getStaffId())).forEach(s -> re.setOrgName(s.getOrgName()))); + resultList.forEach(re -> orgList.stream().filter(l -> re.getStaffId().equals(l.getStaffId())).forEach(s -> { + re.setAgencyId(s.getAgencyId()); + re.setOrgName(s.getOrgName()); + })); return resultList; } From 3c29a9f82562178fd45f47db2fed2f6d3cae7964 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 27 Aug 2021 15:47:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=9A=E4=BA=86=E4=B8=AA)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/InfoGroupReceiversDao.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/InfoGroupReceiversDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/InfoGroupReceiversDao.xml index e57f5bbaf8..d407b12bc2 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/InfoGroupReceiversDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/InfoGroupReceiversDao.xml @@ -16,7 +16,6 @@ #{groupId} - ) From c77d468a44f7b41eb46bc0008ba0873da161baea Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 27 Aug 2021 15:49:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BE=A4=E7=BB=84=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=99=8D=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml index 083bcd133f..d0486df646 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml @@ -29,7 +29,7 @@ and irg.id=#{receiverGroupId} - order by irg.CREATED_TIME asc,igr.id asc + order by irg.CREATED_TIME desc