From eba9ee928fa74b820120f8dd971c7c33c9b7bd44 Mon Sep 17 00:00:00 2001 From: wanghao Date: Thu, 25 Sep 2025 17:32:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BB=8A=E6=97=A5=E5=BA=94?= =?UTF-8?q?=E6=80=A5=E7=9A=84=E5=8D=95=E4=BD=8D=E9=83=A8=E9=97=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LargeScreenDataServiceImpl.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java index 725b7ef..5fdaa77 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java @@ -805,16 +805,30 @@ public class LargeScreenDataServiceImpl extends ServiceImpl watchList = watchListResult.getRecords(); if (watchList != null && !watchList.isEmpty()) { + List userIdList = watchList.stream().map(WatchMonitorDataVo::getUserId).distinct().collect(Collectors.toList()); + List loginUsers = sysBaseAPI.listUserByIdsNew(userIdList); for (WatchMonitorDataVo watch : watchList) { TodayEmergencyVO vo = new TodayEmergencyVO(); + loginUsers.stream().filter(item->item.getId().equals(watch.getUserId())).findFirst().ifPresent(item->{ + if (ObjUtil.isNotEmpty(item.getOrgCode())) { + SysDepart secondDepart = sysCache.getDepartByOrgCode(GlobalUtils.getSecondDepartOrgCode(item.getOrgCode())); + if (secondDepart != null) { + vo.setDepartCode(secondDepart.getOrgCode()); + vo.setDepartName(secondDepart.getDepartName()); + } + SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(item.getOrgCode())); + if (thirdDepart != null) { + vo.setOrgCode(thirdDepart.getOrgCode()); + vo.setOrgName(thirdDepart.getDepartName()); + } + } + }); vo.setUserId(watch.getUserId()); vo.setRealName(watch.getRealName()); vo.setEmergencyType("3"); vo.setSex(watch.getSex()); vo.setAge(watch.getAge()); vo.setPhone(watch.getPhone()); - vo.setDepartName(watch.getOrgName1()); - vo.setOrgName(watch.getOrgName2()); vo.setAddress(watch.getAddress()); vo.setLongitude(watch.getLon()); vo.setLatitude(watch.getLat());