From f8b1073fbb28d37e08016eed32c682f8c5eae391 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 二月 2024 17:26:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/company/src/main/java/com/doumee/api/business/MemberController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/MemberController.java b/server/company/src/main/java/com/doumee/api/business/MemberController.java
index 0efc59a..fafd693 100644
--- a/server/company/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/company/src/main/java/com/doumee/api/business/MemberController.java
@@ -80,8 +80,8 @@
@PostMapping("/page")
@RequiresPermissions("business:member:query")
public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<MemberQueryDTO> pageWrap) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- pageWrap.getModel().setCompanyId(user.getCompanyId());
+// LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+// pageWrap.getModel().setCompanyId(user.getCompanyId());
return ApiResponse.success(memberService.findPageForCompany(pageWrap));
}
@@ -89,15 +89,15 @@
@PostMapping("/exportExcel")
@RequiresPermissions("business:member:exportExcel")
public void exportExcel (@RequestBody PageWrap<MemberQueryDTO> pageWrap, HttpServletResponse response) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ /* LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
pageWrap.getModel().setCompanyId(user.getCompanyId());
List<Member> list = memberService.findPageForCompany(pageWrap).getRecords();
for (int i = 0; i < list.size(); i++) {
Member member = list.get(i);
member.setSn(i+1);
member.setAge(Constants.getAgeByIdCard(member.getIdcardNo()));
- }
- ExcelExporter.build(Member.class).exportWithFirstAndEnd(list, "鍛樺伐鍒楄〃璇﹀崟","鍛樺伐鍒楄〃璇﹀崟",null, response);
+ }*/
+ ExcelExporter.build(Member.class).exportWithFirstAndEnd( memberService.findPageForCompany(pageWrap).getRecords(), "鍛樺伐鍒楄〃璇﹀崟","鍛樺伐鍒楄〃璇﹀崟",null, response);
}
--
Gitblit v1.9.3