Merge remote-tracking branch 'origin/dev'

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())));
+        /*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 gridStaff.stream().filter(g -> StringUtils.isNotBlank(g.getMobile())).collect(Collectors.toList());*/
+        return data;
     }
 
     /**

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.staffGridRoleByIds(userIds);
-        /*List<GridStaffResultDTO> result = baseDao.staffGridRole(forms);*/
+        List<GridStaffResultDTO> result = baseDao.staffGridRole(forms);
         if (CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }