From 87cc98263db6d1eeac48d0c06852c559cd0838ea Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 20 一月 2024 09:37:59 +0800
Subject: [PATCH] 111

---
 server/company/src/main/java/com/doumee/api/business/MemberController.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 f2ff881..4d134c9 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
@@ -71,18 +71,24 @@
         return ApiResponse.success(null);
     }
 
+
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @RequiresPermissions("business:member:query")
-    public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap) {
-        return ApiResponse.success(memberService.findPage(pageWrap));
+    public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<MemberQueryDTO> pageWrap) {
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        pageWrap.getModel().setCompanyId(user.getCompanyId());
+        return ApiResponse.success(memberService.findPageForCompany(pageWrap));
     }
+
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:member:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Member.class).export(memberService.findPage(pageWrap).getRecords(), "鐢ㄥ伐淇℃伅琛�", response);
+    public void exportExcel (@RequestBody PageWrap<MemberQueryDTO> pageWrap, HttpServletResponse response) {
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        pageWrap.getModel().setCompanyId(user.getCompanyId());
+        ExcelExporter.build(Member.class).export(memberService.findPageForCompany(pageWrap).getRecords(), "鐢ㄥ伐淇℃伅琛�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")

--
Gitblit v1.9.3