Commit 7304ad19 by 徐高华

test

parent e5c11c2b
...@@ -903,7 +903,7 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -903,7 +903,7 @@ public class StaffApiServiceImpl implements StaffApiService {
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
for (StaffDTO staffDTO : list) { /*for (StaffDTO staffDTO : list) {
List<String> departmentIds = new ArrayList<>(); List<String> departmentIds = new ArrayList<>();
List<TabHaobanStaffDepartmentRelated> relatedList = staffDepartmentRelatedService.listStaffDepartmentByStaffId(staffDTO.getStaffId()); List<TabHaobanStaffDepartmentRelated> relatedList = staffDepartmentRelatedService.listStaffDepartmentByStaffId(staffDTO.getStaffId());
for (TabHaobanStaffDepartmentRelated tabHaobanStaffDepartmentRelated : relatedList) { for (TabHaobanStaffDepartmentRelated tabHaobanStaffDepartmentRelated : relatedList) {
...@@ -911,8 +911,8 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -911,8 +911,8 @@ public class StaffApiServiceImpl implements StaffApiService {
} }
List<DepartmentDTO> departmentList = departmentService.listByIds(departmentIds); List<DepartmentDTO> departmentList = departmentService.listByIds(departmentIds);
staffDTO.setDepartmentList(departmentList); staffDTO.setDepartmentList(departmentList);
} }*/
//this.addDepartInfo(list); this.addDepartInfo(list);
return list; return list;
} }
...@@ -1195,7 +1195,7 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -1195,7 +1195,7 @@ public class StaffApiServiceImpl implements StaffApiService {
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
for (StaffDTO staffDTO : list) { /*for (StaffDTO staffDTO : list) {
List<String> departmentIds = new ArrayList<>(); List<String> departmentIds = new ArrayList<>();
List<TabHaobanStaffDepartmentRelated> relatedList = staffDepartmentRelatedService.listStaffDepartmentByStaffId(staffDTO.getStaffId()); List<TabHaobanStaffDepartmentRelated> relatedList = staffDepartmentRelatedService.listStaffDepartmentByStaffId(staffDTO.getStaffId());
for (TabHaobanStaffDepartmentRelated tabHaobanStaffDepartmentRelated : relatedList) { for (TabHaobanStaffDepartmentRelated tabHaobanStaffDepartmentRelated : relatedList) {
...@@ -1203,8 +1203,8 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -1203,8 +1203,8 @@ public class StaffApiServiceImpl implements StaffApiService {
} }
List<DepartmentDTO> departmentList = departmentService.listByIds(departmentIds); List<DepartmentDTO> departmentList = departmentService.listByIds(departmentIds);
staffDTO.setDepartmentList(departmentList); staffDTO.setDepartmentList(departmentList);
} }*/
//this.addDepartInfo(list); this.addDepartInfo(list);
return list; return list;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment