From 4de32fdd85a3b8971b9ba2fa15dbcba79cc278a7 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 1 Sep 2025 10:47:35 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20tms-=E5=AE=A2=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E5=BF=AB?=
 =?UTF-8?q?=E9=80=92=E5=AE=A2=E6=88=B7=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=88=E5=85=A8=E9=83=A8=EF=BC=89=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E5=BF=BD=E7=95=A5=E7=BD=91=E7=82=B9=E6=9D=83=E9=99=90=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../web/emis/EmisCustomerUserController.java  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
index 987fdba03..314122723 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
@@ -63,12 +63,11 @@ public class EmisCustomerUserController extends EmisBaseController
     /**
      * 查询快递客户用户列表
      */
-//    @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:list')")
+    // @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:list')")
     @GetMapping("/listMonthUser")
-    public TableDataInfo listMonthUser(EmisCustomerUser emisCustomerUser)
-    {
+    public TableDataInfo listMonthUser(EmisCustomerUser emisCustomerUser) {
         startPage();
-        if(!(getLoginUser().getUser().isTopSite())){
+        if (!(getLoginUser().getUser().isTopSite())) {
             emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode());
         }
         emisCustomerUser.setCustomerType("2");
@@ -76,6 +75,21 @@ public class EmisCustomerUserController extends EmisBaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询快递客户用户列表（全部）
+     */
+    // @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:list')")
+    @GetMapping("/listMonthUserAll")
+    public TableDataInfo listMonthUserAll(EmisCustomerUser emisCustomerUser) {
+        startPage();
+//        if (!(getLoginUser().getUser().isTopSite())) {
+//            emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode());
+//        }
+        emisCustomerUser.setCustomerType("2");
+        List<EmisCustomerUser> list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser);
+        return getDataTable(list);
+    }
+
 //    @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:list')")
     @GetMapping("/listMoneyUser")
     public TableDataInfo listMoneyUser(EmisCustomerUser emisCustomerUser)