From 496f934e695a1816c90a2c86c4859b4e3401e2e7 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Tue, 27 Jan 2026 17:23:16 +0800
Subject: [PATCH] commit

---
 .../v/nutz/zhgh/welfare/controller/WelfareListController.java | 2 +-
 .../controller/statistics/WelfareSingleController.java        | 4 +++-
 .../zhgh/welfare/service/impl/WelfareSingleServiceImpl.java   | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java
index 6c3c6bc..af6bd92 100644
--- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java
+++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java
@@ -829,7 +829,7 @@ public class WelfareListController {
         exportEntities.add(new ExcelExportEntity("单位", "unitname", 20));
         exportEntities.add(new ExcelExportEntity("科室", "threeUnitName", 20));
         exportEntities.add(new ExcelExportEntity("所选福利", "gist_list", 20));
-        if (!ShiroUtil.hasAnyRoles("sysadmin")){
+        if (ShiroUtil.hasAnyRoles("sysadmin")){
             exportEntities.add(new ExcelExportEntity("收货地址", "receiveAddress", 20));
         }
 
diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/statistics/WelfareSingleController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/statistics/WelfareSingleController.java
index b27c881..223915c 100644
--- a/src/main/java/io/v/nutz/zhgh/welfare/controller/statistics/WelfareSingleController.java
+++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/statistics/WelfareSingleController.java
@@ -877,7 +877,9 @@ public class WelfareSingleController {
 //        exportEntities.add(new ExcelExportEntity("收货地址", "receiveAddress", 100));
         exportEntities.add(new ExcelExportEntity("收货人", "recipient", 15));
         exportEntities.add(new ExcelExportEntity("联系方式", "phone", 20));
-        exportEntities.add(new ExcelExportEntity("收货地址", "address", 60));
+        if (ShiroUtil.hasAnyRoles("sysadmin")){
+            exportEntities.add(new ExcelExportEntity("收货地址", "address", 60));
+        }
         ExcelExportEntity excelExportEntity = new ExcelExportEntity();
         excelExportEntity.setName("签字");
         excelExportEntity.setKey("qzBytes");
diff --git a/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java b/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java
index c6eb85a..f32f657 100644
--- a/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java
+++ b/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java
@@ -1263,7 +1263,9 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> impl
                 }
                 v.setRecipient(addressMap.get("收件人"));
                 v.setPhone(addressMap.get("联系方式"));
-                v.setAddress(addressMap.get("收货地址"));
+                if (ShiroUtil.hasAnyRoles("sysadmin")){
+                    v.setAddress(addressMap.get("收货地址"));
+                }
             }
 
         });