From cb5ef5c6470f0cced897301cb87b966aa09dfaad Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Sun, 17 Aug 2025 09:53:40 +0800
Subject: [PATCH] =?UTF-8?q?8=E6=9C=8817=E6=97=A5=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=95=B0=E6=8D=AE=E6=A0=87=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java  | 2 ++
 src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java | 2 ++
 src/main/java/com/example/demo/domain/vo/coin/RefundUser.java   | 2 ++
 src/main/resources/mapper/ConsumeMapper.xml                     | 5 ++++-
 src/main/resources/mapper/RechargeMapper.xml                    | 4 +++-
 src/main/resources/mapper/RefundMapper.xml                      | 5 ++++-
 6 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
index 9aeeb8f..9772c18 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
@@ -71,4 +71,6 @@ public class ConsumeUser implements Serializable {
     private String sortOrder; //排序顺序
     @ExcelIgnore
     private List<String> markets; // 地区列表
+    @ExcelProperty
+    private Integer flag; //是否为员工号
 }
diff --git a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
index 8d04023..0ba4b69 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
@@ -89,4 +89,6 @@ public class RechargeUser {
     private String sortOrder; //排序顺序
     @ExcelIgnore
     private List<String> markets; // 地区列表
+    @ExcelProperty
+    private Integer flag; //是否为员工号
 }
diff --git a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java
index 301d281..d7e51c1 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java
@@ -74,4 +74,6 @@ public class RefundUser {
     private String sortOrder; //排序顺序
     @ExcelIgnore
     private List<String> markets; // 地区列表
+    @ExcelProperty
+    private Integer flag; //是否为员工号
 }
diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml
index 6ebb402..fade5c1 100644
--- a/src/main/resources/mapper/ConsumeMapper.xml
+++ b/src/main/resources/mapper/ConsumeMapper.xml
@@ -94,13 +94,16 @@
         left join market m ON u.market = m.id
 
         <where>
-            ugr.type = 1 AND ugr.flag = 1 AND u.flag = 1
+            ugr.type = 1 AND ugr.flag = 1
             <if test="markets != null and markets.size() > 0">
                 AND u.market IN
                 <foreach collection="markets" item="market" open="(" separator="," close=")">
                     #{market}
                 </foreach>
             </if>
+            <if test="flag != 0">
+                AND u.flag = 1
+            </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>
diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml
index 623bec4..61c5b8e 100644
--- a/src/main/resources/mapper/RechargeMapper.xml
+++ b/src/main/resources/mapper/RechargeMapper.xml
@@ -99,7 +99,6 @@
         <where>
             ugr.type = 0 AND ugr.audit_status IN (1,3)
             AND ugr.flag = 1
-            AND u.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
             <if test="markets != null and markets.size() > 0">
                 AND u.market IN
@@ -107,6 +106,9 @@
                     #{market}
                 </foreach>
             </if>
+            <if test="flag != 0">
+                AND u.flag = 1
+            </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>
diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml
index 38a5025..4f23c9d 100644
--- a/src/main/resources/mapper/RefundMapper.xml
+++ b/src/main/resources/mapper/RefundMapper.xml
@@ -97,7 +97,7 @@
         admin a ON ugr.admin_id = a.id
         left join market m ON u.market = m.id
         <where>
-            ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1 AND u.flag = 1
+            ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
             <if test="markets != null and markets.size() > 0">
                 AND u.market IN
@@ -105,6 +105,9 @@
                     #{market}
                 </foreach>
             </if>
+            <if test="flag != 0">
+                AND u.flag = 1
+            </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>