Merge remote-tracking branch 'origin/milestone-20251104-现金管理二期' into milestone-20251104-现金管理二期

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; //支付时间

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")

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>