From 15d22394ab2b9573f32906f49f2f21710d534c43 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Wed, 26 Jul 2023 11:44:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=9A=84=20=E6=B8=A0=E9=81=93=E5=92=8C=E7=BD=91?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E5=8F=AF=E4=BB=A5=E9=80=9A=E8=BF=87=E5=AE=A2?= =?UTF-8?q?=E6=88=B7ID=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/modules/bms/controller/BmsChannelController.java | 3 ++- .../modules/bms/controller/my/BmsChannelMyController.java | 6 +++--- .../java/com/qs/serve/modules/bms/entity/BmsChannel.java | 4 ++++ .../com/qs/serve/modules/bms/mapper/BmsChannelMapper.java | 2 +- .../qs/serve/modules/bms/mapper/BmsChannelPointMapper.java | 4 ++-- .../com/qs/serve/modules/bms/service/BmsChannelService.java | 2 +- .../bms/service/impl/BmsChannelPointServiceImpl.java | 4 ++-- .../modules/bms/service/impl/BmsChannelServiceImpl.java | 4 ++-- src/main/resources/mapper/bms/BmsChannelMapper.xml | 1 + src/main/resources/mapper/bms/BmsChannelPointMapper.xml | 2 ++ 10 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java index a87997a1..c7f4f5c2 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java @@ -91,9 +91,10 @@ public class BmsChannelController { if(param.getLoadByCurrent()!=null&¶m.getLoadByCurrent().equals(1)){ return bmsChannelMyController.getPage4UnderAndMine(param); } - PageUtil.startPage(); LambdaQueryWrapper channelWrapper = new LambdaQueryWrapper<>(param); channelWrapper.orderByDesc(BmsChannel::getCreateTime); + + PageUtil.startPage(); List list = bmsChannelService.list(channelWrapper); return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java index 32227ffa..536c26fe 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java @@ -59,7 +59,7 @@ public class BmsChannelMyController { @GetMapping("/page") public R> getPage(BmsChannel param){ PageUtil.startPage(); - List list = bmsChannelService.selectChannelList(param, Arrays.asList(AuthContextUtils.getSysUserId())); + List list = bmsChannelService.selectChannelList(param, Arrays.asList(AuthContextUtils.getSysUserId()),null); return R.byPageHelperList(list); } @@ -77,7 +77,7 @@ public class BmsChannelMyController { return R.byEmptyList(); } PageUtil.startPage(); - List list = bmsChannelService.selectChannelList(param, userIds); + List list = bmsChannelService.selectChannelList(param, userIds,null); return R.byPageHelperList(list); } @@ -92,7 +92,7 @@ public class BmsChannelMyController { List userIds = postUserService.listByChildIds(loginUserId); userIds.add(loginUserId); PageUtil.startPage(); - List list = bmsChannelService.selectChannelList(param, userIds); + List list = bmsChannelService.selectChannelList(param, userIds,param.getSupplierIdForFindChild()); return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java index 5ea036eb..810fe720 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java @@ -84,6 +84,10 @@ public class BmsChannel implements Serializable { @TableField(exist = false) private Integer loadByCurrent; + /** 用于接参查询 */ + @TableField(exist = false) + private String supplierIdForFindChild; + /** 选择的渠道ID */ @TableField(exist = false) private List selectIds; diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelMapper.java index 33915e2c..c3008f41 100644 --- a/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelMapper.java +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelMapper.java @@ -13,7 +13,7 @@ import java.util.List; */ public interface BmsChannelMapper extends BaseMapper { - List selectChannelList(@Param("query") BmsChannel channel, @Param("userIds") List userIds); + List selectChannelList(@Param("query") BmsChannel channel, @Param("userIds") List userIds,@Param("supplierId") String supplierId); } diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java index 08926991..0f435820 100644 --- a/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java @@ -33,9 +33,9 @@ public interface BmsChannelPointMapper extends BaseMapper { List selectChannelPointList(@Param("query") BmsChannelPoint channelPoint); - List selectPointByUserIds(@Param("query")BmsChannelPoint channelPoint, @Param("userIds")List userIds, @Param("rowInfo") RowParam rowParam); + List selectPointByUserIds(@Param("query")BmsChannelPoint channelPoint, @Param("userIds")List userIds,@Param("supplierId") String supplierId, @Param("rowInfo") RowParam rowParam); - Long selectCountPointByUserIds(@Param("query")BmsChannelPoint channelPoint, @Param("userIds")List userIds); + Long selectCountPointByUserIds(@Param("query")BmsChannelPoint channelPoint, @Param("userIds")List userIds,@Param("supplierId") String supplierId); /** * 直属管理人 diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsChannelService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsChannelService.java index 80c2d11f..a71c0333 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/BmsChannelService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsChannelService.java @@ -11,7 +11,7 @@ import java.util.List; */ public interface BmsChannelService extends IService { - List selectChannelList(BmsChannel channel,List userIds); + List selectChannelList(BmsChannel channel,List userIds,String supplierId); } diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java index 812306a5..9a221558 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java @@ -123,12 +123,12 @@ public class BmsChannelPointServiceImpl extends ServiceImpl selectChannelPointMyList(BmsChannelPoint channelPoint, List userIds) { - return baseMapper.selectPointByUserIds(channelPoint, userIds,new RowParam(true)); + return baseMapper.selectPointByUserIds(channelPoint, userIds,channelPoint.getSupplierId(),new RowParam(true)); } @Override public Long selectCountChannelPointMyList(BmsChannelPoint channelPoint, List userIds) { - return baseMapper.selectCountPointByUserIds(channelPoint, userIds); + return baseMapper.selectCountPointByUserIds(channelPoint, userIds,channelPoint.getSupplierId()); } @Override diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelServiceImpl.java index ebc3915e..ab5108dd 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelServiceImpl.java @@ -21,8 +21,8 @@ import java.util.List; public class BmsChannelServiceImpl extends ServiceImpl implements BmsChannelService { @Override - public List selectChannelList(BmsChannel channel, List userIds) { - return baseMapper.selectChannelList(channel, userIds); + public List selectChannelList(BmsChannel channel, List userIds,String supplierId) { + return baseMapper.selectChannelList(channel, userIds, supplierId); } } diff --git a/src/main/resources/mapper/bms/BmsChannelMapper.xml b/src/main/resources/mapper/bms/BmsChannelMapper.xml index c5998f36..f735c010 100644 --- a/src/main/resources/mapper/bms/BmsChannelMapper.xml +++ b/src/main/resources/mapper/bms/BmsChannelMapper.xml @@ -41,6 +41,7 @@ #{selectId} + and bms_supplier_channel.supplier_id = #{supplierId} and `bms_supplier_channel`.`del_flag` = 0 GROUP BY channel_id ) tmp diff --git a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml index 943ee877..647a1c4f 100644 --- a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml +++ b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml @@ -283,6 +283,7 @@ #{selectId} + and bms_supplier_channel.supplier_id = #{supplierId} and `bms_supplier_channel`.`del_flag` = 0 GROUP BY channel_id ) tmp left join`bms_channel_point` `bms_channel_point` ON `tmp`.channel_id = bms_channel_point.`channel_id` @@ -316,6 +317,7 @@ #{selectId} + and bms_supplier_channel.supplier_id = #{supplierId} and `bms_supplier_channel`.`del_flag` = 0 GROUP BY channel_id ) tmp left join`bms_channel_point` `bms_channel_point` ON `tmp`.channel_id = bms_channel_point.`channel_id`