Merge branch 'feature/login-token' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -1480,7 +1480,20 @@ public class StaffApiServiceImpl implements StaffApiService {
 
     @Override
     public List<StaffDTO> listByOpenUserIdsAndWxEnterpriseId(List<String> openUserIds, String wxEnterpriseId) {
-        return EntityUtil.changeEntityListNew(StaffDTO.class, staffMapper.listByOpenUserIdsAndWxEnterpriseId(openUserIds, wxEnterpriseId));
+        List<StaffDTO> list = staffService.listByOpenUserIdsAndWxEnterpriseId(openUserIds, wxEnterpriseId);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.EMPTY_LIST;
+        }
+        for (StaffDTO staffDTO : list) {
+            List<String> departmentIds = new ArrayList<>();
+            List<TabHaobanStaffDepartmentRelated> relatedList = staffDepartmentRelatedService.listStaffDepartmentByStaffId(staffDTO.getStaffId());
+            for (TabHaobanStaffDepartmentRelated tabHaobanStaffDepartmentRelated : relatedList) {
+                departmentIds.add(tabHaobanStaffDepartmentRelated.getDepartmentId());
+            }
+            List<DepartmentDTO> departmentList = departmentService.listByIds(departmentIds);
+            staffDTO.setDepartmentList(departmentList);
+        }
+        return list;
     }
 
     @Override