fix

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -27,7 +27,7 @@ public interface StaffApiService {
 
 	public List<StaffDepartmentRelatedDTO> listStaffDepartmentByStaffId(String staffId);
 
-	public Page<StaffDTO> pageStaff(String departmentId, Integer activeFlag, String keyword, BasePageInfo pageInfo);
+	public Page<StaffDTO> pageStaff(List<String> departmentId, Integer activeFlag, String keyword, BasePageInfo pageInfo);
 
 	public void del(String staffDepartmentStaffRelatedId);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffDepartmentRelatedMapper.java

@@ -40,7 +40,7 @@ public interface StaffDepartmentRelatedMapper {
 
 	TabHaobanStaffDepartmentRelated getDepartmentIdAndCode(@Param("departmentId")String departmentId, @Param("clerkCode")String code);
 
-	List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(@Param("departmentId")String departmentId, @Param("keyword")String keyword);
+	List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(@Param("departmentIds")List<String> departmentIds, @Param("keyword")String keyword);
 
 	int countByDepartmentIds(@Param("departmentIds")List<String> departmentIds);
 	

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffDepartmentRelatedService.java

@@ -24,7 +24,7 @@ public interface StaffDepartmentRelatedService {
 
 	int countByDepartmentId(String departmentId);
 
-	List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(String departmentId, String keyword);
+	List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(List<String> departmentId, String keyword);
 	
 	List<TabHaobanStaffDepartmentRelated> listByWxUserId(String wxUserId);
 

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

 package com.gic.haoban.manage.service.service.impl;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -81,8 +82,11 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
 	}
 
 	@Override
-	public List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(String departmentId, String keyword) {
-		return mapper.listByDepartmentIdByKeyword(departmentId,keyword);
+	public List<TabHaobanStaffDepartmentRelated> listByDepartmentIdByKeyword(List<String> departmentIds, String keyword) {
+		if(departmentIds == null || departmentIds.isEmpty()){
+			return Collections.EMPTY_LIST;
+		}
+		return mapper.listByDepartmentIdByKeyword(departmentIds,keyword);
 	}
 	@Override
 	public StaffDepartmentRelatedDTO getById(String staffDepartmentStaffRelatedId) {

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

@@ -208,8 +208,8 @@ public class StaffApiServiceImpl implements StaffApiService {
 	}
 
 	@Override
-	public Page<StaffDTO> pageStaff(String departmentId, Integer activeFlag, String keyword, BasePageInfo pageInfo) {
-		List<TabHaobanStaffDepartmentRelated> list = staffDepartmentRelatedService.listByDepartmentIdByKeyword(departmentId,keyword);
+	public Page<StaffDTO> pageStaff(List<String> departmentIds, Integer activeFlag, String keyword, BasePageInfo pageInfo) {
+		List<TabHaobanStaffDepartmentRelated> list = staffDepartmentRelatedService.listByDepartmentIdByKeyword(departmentIds,keyword);
 		Set<String> staffIds = new HashSet<String>();
 		for (TabHaobanStaffDepartmentRelated tabHaobanStaffDepartmentRelated : list) {
 			staffIds.add(tabHaobanStaffDepartmentRelated.getStaffId());

haoban-manage3-service/src/main/resources/mapper/StaffDepartmentRelatedMapper.xml

@@ -280,11 +280,16 @@
     <include refid="Base_Column_List" />
     from tab_haoban_staff_department_related
     where 1
-    and department_id = #{departmentId}
     and status_flag = 1
     <if test="keyword != null and keyword != ''">
     and (clerk_code  like CONCAT('%',#{keyword},'%') or phone_number  like CONCAT('%',#{keyword},'%') or staff_name  like CONCAT('%',#{keyword},'%'))
     </if>
+    <if test="departmentIds != null and departmentIds.size() > 0">
+    and department_id in 
+    <foreach collection="departmentIds" item="id" index="index" open="(" close=")" separator=",">
+      #{id,jdbcType=VARCHAR}
+    </foreach>
+    </if>
   </select>
   
   <select id="countByDepartmentIds" resultType="java.lang.Integer"  >

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -104,7 +104,13 @@ public class StaffController extends WebBaseController{
 	
 	@RequestMapping("staff-list")
 	public HaobanResponse staffList(String departmentId,Integer activeFlag,String keyWord,BasePageInfo pageInfo){
-		Page<StaffDTO> page = staffApiService.pageStaff(departmentId,activeFlag,keyWord,pageInfo);
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		String wxEnterpriseId = login.getWxEnterpriseId();
+		List<String> departmentIdSet = new ArrayList<>();
+		departmentIdSet.add(departmentId);
+		List<DepartmentDTO> sonDepartmentList = departmentApiService.listSonByDepartmentIds(departmentIdSet, wxEnterpriseId);
+		List<String> departmentIds = sonDepartmentList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
+		Page<StaffDTO> page = staffApiService.pageStaff(departmentIds,activeFlag,keyWord,pageInfo);
 		List<StaffDTO> list = page.getResult();
 //		if(list != null) {
 //			for (StaffDTO staffDTO : list) {