Commit 78fc61e2 by qwmqiuwenmin

fix

parent ef7d85cb
...@@ -454,6 +454,11 @@ public class StaffController extends WebBaseController{ ...@@ -454,6 +454,11 @@ public class StaffController extends WebBaseController{
pageInfo.setPageSize(pageSize); pageInfo.setPageSize(pageSize);
LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser(); LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
String wxEnterpriseId = login.getWxEnterpriseId(); String wxEnterpriseId = login.getWxEnterpriseId();
WxEnterpriseDTO enterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
String wxEnterpriseName = "";
if(enterprise != null){
wxEnterpriseName = enterprise.getCorpName();
}
List<DepartmentShortDTO> relationList = departmentApiService.listAllDepartment(wxEnterpriseId); List<DepartmentShortDTO> relationList = departmentApiService.listAllDepartment(wxEnterpriseId);
Map<String,DepartmentShortDTO> departmentMap = relationList.stream().collect(Collectors.toMap(DepartmentShortDTO::getDepartmentId, s -> s)); Map<String,DepartmentShortDTO> departmentMap = relationList.stream().collect(Collectors.toMap(DepartmentShortDTO::getDepartmentId, s -> s));
List<String> departmentIds = relationList.stream().map(DepartmentShortDTO::getDepartmentId).collect(Collectors.toList()); List<String> departmentIds = relationList.stream().map(DepartmentShortDTO::getDepartmentId).collect(Collectors.toList());
...@@ -482,7 +487,7 @@ public class StaffController extends WebBaseController{ ...@@ -482,7 +487,7 @@ public class StaffController extends WebBaseController{
if(CollectionUtils.isNotEmpty(sonList)){ if(CollectionUtils.isNotEmpty(sonList)){
list.addAll(sonList); list.addAll(sonList);
} }
String fileName = "会员导出" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_14); String fileName = wxEnterpriseName + "通讯录" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATE_8);
List<String> fileList = new ArrayList<>(); List<String> fileList = new ArrayList<>();
List<String> titleList = new ArrayList<>(); List<String> titleList = new ArrayList<>();
titleList.add("姓名"); titleList.add("姓名");
......
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