diff --git a/src/main/java/com/example/demo/mapper/RechargeMapper.java b/src/main/java/com/example/demo/mapper/RechargeMapper.java index 9e81b18..a2551a7 100644 --- a/src/main/java/com/example/demo/mapper/RechargeMapper.java +++ b/src/main/java/com/example/demo/mapper/RechargeMapper.java @@ -58,7 +58,7 @@ public interface RechargeMapper { "AND recharge.create_time BETWEEN #{startDate} AND #{endDate}", "and pay_way like concat('%',#{payWay},'%')", "and recharge_way like concat('%',#{rechargeWay},'%')", - "and area=#{area}", + "and user.area=#{area}", "and audit.status=#{status}", "", "ORDER BY recharge.create_time DESC", diff --git a/src/main/java/com/example/demo/mapper/RefundMapper.java b/src/main/java/com/example/demo/mapper/RefundMapper.java index 7ea31cd..3071b1f 100644 --- a/src/main/java/com/example/demo/mapper/RefundMapper.java +++ b/src/main/java/com/example/demo/mapper/RefundMapper.java @@ -76,9 +76,10 @@ public interface RefundMapper { "LEFT JOIN audit au ON d.detail_id = au.refund_id", "WHERE d.detail_flag = 1 and update_type = 2 ", "and au.status=#{status}", + "AND u.area = #{area}", "AND d.jwcode = #{jwcode}", - "AND d.refund_type LIKE CONCAT('%', #{refundType}, '%')", - "AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%')", + "AND d.refund_type LIKE CONCAT('%', #{refundType}, '%')", + "AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%')", "AND d.create_time BETWEEN #{startDate} AND #{endDate}", "ORDER BY d.create_time DESC", ""