From 925b6bfe8fdf5034699fd54ea46febcf8d40fea0 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Wed, 5 Nov 2025 10:56:03 +0800
Subject: [PATCH] =?UTF-8?q?11-05=20=E5=91=98=E5=B7=A5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java | 2 +-
 src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java   | 2 +-
 src/main/resources/mapper/AuditMapper.xml                        | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java
index 7483312..3c009db 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java
@@ -55,7 +55,7 @@ public class RechargeAudit {
     private String auditName; //审核人姓名
     private Byte type; //类型
     private String rejectReason; //驳回理由
-   // private Integer flag;   //是否为员工号 0员工号 1非员工号
+    private Integer flag;   //是否为员工号 0员工号 1非员工号
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private String payTime; //支付时间
diff --git a/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java b/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java
index 658c8d4..1d04c13 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java
@@ -51,7 +51,7 @@ public class RefundAudit {
     private String auditName; //审核人姓名
     private String rejectReason; //驳回理由
     private Byte type;  //类型
-  //  private Integer flag;   //是否为员工号 0-员工号  1-非员工号
+    private Integer flag;   //是否为员工号 0-员工号  1-非员工号
 
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml
index c50b277..ffa4b51 100644
--- a/src/main/resources/mapper/AuditMapper.xml
+++ b/src/main/resources/mapper/AuditMapper.xml
@@ -71,6 +71,9 @@
             <if test="rechargeAudit.jwcode != null and rechargeAudit.jwcode != ''">
                 AND ugr.jwcode = #{rechargeAudit.jwcode}
             </if>
+            <if test="rechargeAudit.flag!=0">
+                AND u.flag = 1
+            </if>
             <if test="rechargeAudit.activity != null and rechargeAudit.activity != ''">
                 AND ugr.activity = #{rechargeAudit.activity}
             </if>
@@ -133,6 +136,9 @@
             <if test="refundAudit.jwcode != null">
                 AND ugr.jwcode = #{refundAudit.jwcode}
             </if>
+            <if test="refundAudit.flag!=0">
+                AND u.flag = 1
+            </if>
             <if test="refundAudit.refundModel != null ">
                 AND ugr.refund_model = #{refundAudit.refundModel}
             </if>