From 1d3b1157a899b1487bb92ade7e85a0fdddce4e8e Mon Sep 17 00:00:00 2001 From: hu177768073 <177768073@qq.com> Date: Tue, 31 Dec 2024 17:47:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cweb/controller/BsDiscountUserController.java | 1 + service/src/main/java/com/hfkj/dao/BsAgentMerMapperExt.java | 1 + 2 files changed, 2 insertions(+) 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 " +