Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java

@@ -91,9 +91,10 @@ public class BmsChannelController {
         if(param.getLoadByCurrent()!=null&&param.getLoadByCurrent().equals(1)){
             return bmsChannelMyController.getPage4UnderAndMine(param);
         }
-        PageUtil.startPage();
         LambdaQueryWrapper<BmsChannel> channelWrapper = new LambdaQueryWrapper<>(param);
         channelWrapper.orderByDesc(BmsChannel::getCreateTime);
+
+        PageUtil.startPage();
         List<BmsChannel> list = bmsChannelService.list(channelWrapper);
         return R.byPageHelperList(list);
     }

src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java

@@ -59,7 +59,7 @@ public class BmsChannelMyController {
     @GetMapping("/page")
     public R<PageVo<BmsChannel>> getPage(BmsChannel param){
         PageUtil.startPage();
-        List<BmsChannel> list = bmsChannelService.selectChannelList(param, Arrays.asList(AuthContextUtils.getSysUserId()));
+        List<BmsChannel> 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<BmsChannel> list = bmsChannelService.selectChannelList(param, userIds);
+        List<BmsChannel> list = bmsChannelService.selectChannelList(param, userIds,null);
         return R.byPageHelperList(list);
     }
 
@@ -92,7 +92,7 @@ public class BmsChannelMyController {
         List<String> userIds = postUserService.listByChildIds(loginUserId);
         userIds.add(loginUserId);
         PageUtil.startPage();
-        List<BmsChannel> list = bmsChannelService.selectChannelList(param, userIds);
+        List<BmsChannel> list = bmsChannelService.selectChannelList(param, userIds,param.getSupplierIdForFindChild());
         return R.byPageHelperList(list);
     }
 

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<String> selectIds;

src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface BmsChannelMapper extends BaseMapper<BmsChannel> {
 
-    List<BmsChannel> selectChannelList(@Param("query") BmsChannel channel, @Param("userIds") List<String> userIds);
+    List<BmsChannel> selectChannelList(@Param("query") BmsChannel channel, @Param("userIds") List<String> userIds,@Param("supplierId") String supplierId);
 
 }
 

src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java

@@ -33,9 +33,9 @@ public interface BmsChannelPointMapper extends BaseMapper<BmsChannelPoint> {
 
     List<BmsChannelPoint> selectChannelPointList(@Param("query") BmsChannelPoint channelPoint);
 
-    List<BmsChannelPoint> selectPointByUserIds(@Param("query")BmsChannelPoint channelPoint, @Param("userIds")List<String> userIds, @Param("rowInfo") RowParam rowParam);
+    List<BmsChannelPoint> selectPointByUserIds(@Param("query")BmsChannelPoint channelPoint, @Param("userIds")List<String> userIds,@Param("supplierId") String supplierId, @Param("rowInfo") RowParam rowParam);
 
-    Long selectCountPointByUserIds(@Param("query")BmsChannelPoint channelPoint, @Param("userIds")List<String> userIds);
+    Long selectCountPointByUserIds(@Param("query")BmsChannelPoint channelPoint, @Param("userIds")List<String> userIds,@Param("supplierId") String supplierId);
 
     /**
      * 直属管理人

src/main/java/com/qs/serve/modules/bms/service/BmsChannelService.java

@@ -11,7 +11,7 @@ import java.util.List;
  */
 public interface BmsChannelService extends IService<BmsChannel> {
 
-    List<BmsChannel> selectChannelList(BmsChannel channel,List<String> userIds);
+    List<BmsChannel> selectChannelList(BmsChannel channel,List<String> userIds,String supplierId);
 
 }
 

src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java

@@ -123,12 +123,12 @@ public class BmsChannelPointServiceImpl extends ServiceImpl<BmsChannelPointMappe
 
     @Override
     public List<BmsChannelPoint> selectChannelPointMyList(BmsChannelPoint channelPoint, List<String> 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<String> userIds) {
-        return baseMapper.selectCountPointByUserIds(channelPoint, userIds);
+        return baseMapper.selectCountPointByUserIds(channelPoint, userIds,channelPoint.getSupplierId());
     }
 
     @Override

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<BmsChannelMapper,BmsChannel> implements BmsChannelService {
 
     @Override
-    public List<BmsChannel> selectChannelList(BmsChannel channel, List<String> userIds) {
+    public List<BmsChannel> selectChannelList(BmsChannel channel, List<String> userIds,String supplierId) {
-        return baseMapper.selectChannelList(channel, userIds);
+        return baseMapper.selectChannelList(channel, userIds, supplierId);
     }
 
 }

src/main/resources/mapper/bms/BmsChannelMapper.xml

@@ -41,6 +41,7 @@
             <foreach collection="userIds" item ="selectId" index="i" open="(" close=")" separator=",">
                 #{selectId}
             </foreach>
+            <if test="supplierId != null and supplierId != ''"> and bms_supplier_channel.supplier_id  = #{supplierId}</if>
             and `bms_supplier_channel`.`del_flag` = 0
             GROUP BY channel_id
         ) tmp

src/main/resources/mapper/bms/BmsChannelPointMapper.xml

@@ -283,6 +283,7 @@
             <foreach collection="userIds" item ="selectId" index="i" open="(" close=")" separator=",">
                 #{selectId}
             </foreach>
+            <if test="supplierId != null and supplierId != ''"> and bms_supplier_channel.supplier_id  = #{supplierId}</if>
             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 @@
         <foreach collection="userIds" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>
+        <if test="supplierId != null and supplierId != ''"> and bms_supplier_channel.supplier_id  = #{supplierId}</if>
         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`