diff --git a/cweb/src/main/java/com/cweb/controller/BsDiscountUserController.java b/cweb/src/main/java/com/cweb/controller/BsDiscountUserController.java index aeda96b..ec57bc3 100644 --- a/cweb/src/main/java/com/cweb/controller/BsDiscountUserController.java +++ b/cweb/src/main/java/com/cweb/controller/BsDiscountUserController.java @@ -120,6 +120,7 @@ public class BsDiscountUserController { param.put("userId", userSession.getUser().getId()); param.put("useMerNo", merNo); param.put("useScope", useScope); + param.put("status", DiscountUserStatusEnum.type1.getCode()); discountList = discountUserService.getUserDiscountList(param); } } catch (Exception e) { diff --git a/service/src/main/java/com/hfkj/dao/BsAgentMerMapperExt.java b/service/src/main/java/com/hfkj/dao/BsAgentMerMapperExt.java index 4927e1d..62189a5 100644 --- a/service/src/main/java/com/hfkj/dao/BsAgentMerMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/BsAgentMerMapperExt.java @@ -46,6 +46,7 @@ public interface BsAgentMerMapperExt { " a.merName," + " a.merAddress," + " a.agentName," + + " a.`status`," + " a.createTime," + " GROUP_CONCAT(a.agentStaffName) agentStaff" + " FROM " +