From 0804b61d83cb7bcc13fac034b0e72b9459044342 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 23 Feb 2022 16:48:17 +0800
Subject: [PATCH] =?UTF-8?q?user=EF=BC=8Corg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/CustomerStaffGridServiceImpl.java | 5 +++--
 .../java/com/epmet/service/impl/StaffRoleServiceImpl.java    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
index 184a4b7acd..c744a1b0a2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
@@ -176,8 +176,9 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
         if (CollectionUtils.isEmpty(data)){
             return new ArrayList<>();
         }
-        gridStaff.stream().forEach(g -> data.stream().filter(d -> g.getStaffId().equals(d.getStaffId()) && g.getGridId().equals(d.getGridId())).forEach(d -> g.setMobile(d.getMobile())));
-        return gridStaff.stream().filter(g -> StringUtils.isNotBlank(g.getMobile())).collect(Collectors.toList());
+        /*gridStaff.stream().forEach(g -> data.stream().filter(d -> g.getStaffId().equals(d.getStaffId()) && g.getGridId().equals(d.getGridId())).forEach(d -> g.setMobile(d.getMobile())));
+        return gridStaff.stream().filter(g -> StringUtils.isNotBlank(g.getMobile())).collect(Collectors.toList());*/
+        return data;
     }
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
index c5f75b2222..6b69b9506b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
@@ -138,8 +138,8 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
             return new ArrayList<>();
         }
         List<String> userIds = forms.stream().map(m -> m.getStaffId()).distinct().collect(Collectors.toList());
-        List<GridStaffResultDTO> result = baseDao.staffGridRoleByIds(userIds);
-        /*List<GridStaffResultDTO> result = baseDao.staffGridRole(forms);*/
+//        List<GridStaffResultDTO> result = baseDao.staffGridRoleByIds(userIds);
+        List<GridStaffResultDTO> result = baseDao.staffGridRole(forms);
         if (CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }