diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccConsumeDetailQueryParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccConsumeDetailQueryParam.java index d04236c..447d59f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccConsumeDetailQueryParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccConsumeDetailQueryParam.java @@ -21,6 +21,7 @@ public class AccConsumeDetailQueryParam extends BaseEntity { @ApiModelProperty("交易类型") private Integer tradeType; private Integer walletId; + private Integer userType; private String searchValue; public AccConsumeDetailQueryParam() { this.endDateTime = LocalDateTime.now().plusDays(7); diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml index f296a98..c9ca8dd 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml @@ -328,6 +328,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and atwd.wallet_id = #{param.walletId} + + and su.user_type = #{param.userType} + and sd.dept_id in