Commit 6f71415f by QianQiXiang

增加一个门店code

parent 175a231e
...@@ -486,6 +486,9 @@ public class StaffController extends WebBaseController{ ...@@ -486,6 +486,9 @@ public class StaffController extends WebBaseController{
int pageNum = 1; int pageNum = 1;
pageInfo.setPageNum(pageNum); pageInfo.setPageNum(pageNum);
pageInfo.setPageSize(pageSize); pageInfo.setPageSize(pageSize);
String departmentId=request.getParameter("departmentId");
List<String> departmentIdSet = new ArrayList<>();
departmentIdSet.add(departmentId);
LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser(); LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
String wxEnterpriseId = login.getWxEnterpriseId(); String wxEnterpriseId = login.getWxEnterpriseId();
WxEnterpriseDTO enterprise = wxEnterpriseApiService.getOne(wxEnterpriseId); WxEnterpriseDTO enterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
...@@ -493,9 +496,9 @@ public class StaffController extends WebBaseController{ ...@@ -493,9 +496,9 @@ public class StaffController extends WebBaseController{
if(enterprise != null){ if(enterprise != null){
wxEnterpriseName = enterprise.getCorpName(); wxEnterpriseName = enterprise.getCorpName();
} }
List<DepartmentShortDTO> relationList = departmentApiService.listAllDepartment(wxEnterpriseId); List<DepartmentDTO> relationList = departmentApiService.listSonByDepartmentIds(departmentIdSet,wxEnterpriseId);
Map<String,DepartmentShortDTO> departmentMap = relationList.stream().collect(Collectors.toMap(DepartmentShortDTO::getDepartmentId, s -> s)); Map<String,DepartmentDTO> departmentMap = relationList.stream().collect(Collectors.toMap(DepartmentDTO::getDepartmentId, s -> s));
List<String> departmentIds = relationList.stream().map(DepartmentShortDTO::getDepartmentId).collect(Collectors.toList()); List<String> departmentIds = relationList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
Page<StaffDTO> page = staffApiService.pageStaff(departmentIds,null,null,pageInfo); Page<StaffDTO> page = staffApiService.pageStaff(departmentIds,null,null,pageInfo);
List<StaffDTO> list = page.getResult(); List<StaffDTO> list = page.getResult();
logger.info("pages={},totalPage={}",page.getCurrentPage(),page.getTotalPage()); logger.info("pages={},totalPage={}",page.getCurrentPage(),page.getTotalPage());
......
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