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 @@ AND ugr.jwcode = #{rechargeAudit.jwcode} + + AND u.flag = 1 + AND ugr.activity = #{rechargeAudit.activity} @@ -133,6 +136,9 @@ AND ugr.jwcode = #{refundAudit.jwcode} + + AND u.flag = 1 + AND ugr.refund_model = #{refundAudit.refundModel}