From b23a7cc13d3cac4a92dae9a454caa5d315318472 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 01 十一月 2024 14:01:42 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index 7343cc6..d8220d6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -266,8 +266,10 @@
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:member:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
-        ExcelExporter.build(Member.class).export(memberService.findPage(pageWrap).getRecords(), "浜哄憳淇℃伅琛�", response);
+    public void exportExcel (@RequestBody PageWrap<MemberQuery> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+//        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
+//        return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
+        ExcelExporter.build(Member.class).export(memberService.findMemberInfoPage(pageWrap).getRecords(), "浜哄憳淇℃伅琛�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
@@ -293,6 +295,7 @@
         if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
             return ApiResponse.success(memberService.findVisitPage(pageWrap));
         }else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
+            pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
             return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
         }else {
             return ApiResponse.success(null);

--
Gitblit v1.9.3