diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelStatusMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelStatusMapper.java
index 793ab72..59a6cae 100644
--- a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelStatusMapper.java
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelStatusMapper.java
@@ -54,5 +54,5 @@ public interface MerchantChannelStatusMapper extends BaseMapper<MerchantChannelS
     UserNumVO getUserNumInfo(@Param("userId") Long userId, @Param("date")String date, @Param("dateType")Integer dateType);
     List<merchantChannelVO> pageDate(@Param("pageSize")Integer size, @Param("offset")Integer page);
 
-    List<Integer> getChannelByMerchantCode(@Param("merchantCode") String merchantCode);
+    List<Integer> getChannelByMerchantCode(@Param("merchantCode") String merchantCode,@Param("merchantCodeList") List<String> merchantCodeList);
 }
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelStatusMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelStatusMapper.xml
index db75535..a700d56 100644
--- a/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelStatusMapper.xml
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelStatusMapper.xml
@@ -90,6 +90,9 @@
         order by mcs.id desc limit #{pageSize} offset #{offset};
     </select>
     <select id="getChannelByMerchantCode" resultType="java.lang.Integer">
-        SELECT channel FROM tb_pluss_merchant_channel_status WHERE merchantCode=#{merchantCode}
+        SELECT channel FROM tb_pluss_merchant_channel_status WHERE merchantCode IN
+        <foreach collection="merchantCodeList" item="item" open="(" close=")" index="index" separator=",">
+        #{item}
+        </foreach>
     </select>
 </mapper>
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceServiceImpl.java
index a2c35f4..4385b73 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceServiceImpl.java
@@ -208,7 +208,19 @@ public class MerchantCashPlaceServiceImpl extends ServiceImpl<MerchantCashPlaceM
 
     @Override
     public List<MerchantChannel> merchantChannel(String merchantCode,List<MerchantChannel> merchantChannels) {
-        List<Integer> channelByMerchantCode = channelStatusMapper.getChannelByMerchantCode(merchantCode);
+        List<String> merchantCodes = new ArrayList<>();
+
+        if (merchantCode != null){
+            QueryWrapper<MerchantBaseInfo> qW = new QueryWrapper<>();
+            qW.eq("masterMerchantCode",merchantCode);
+            List<MerchantBaseInfo> baseInfo = merchantBaseInfoService.list(qW);
+            for (MerchantBaseInfo date :baseInfo) {
+                merchantCodes.add(date.getMerchantCode());
+            }
+            merchantCodes.add(merchantCode);
+        }
+
+        List<Integer> channelByMerchantCode = channelStatusMapper.getChannelByMerchantCode(merchantCode,merchantCodes);
         for (MerchantChannel data : merchantChannels) {
             for (Integer i :channelByMerchantCode) {
                 if (data.getId().equals(i)){
@@ -370,7 +382,7 @@ public class MerchantCashPlaceServiceImpl extends ServiceImpl<MerchantCashPlaceM
         String merchantCode = merchantBaseInfo.getMerchantCode();
         QueryWrapper<MerchantBaseInfo> qW = new QueryWrapper<>();
         qW.eq("masterMerchantCode",merchantCode);
-        qW.like(StringUtils.isNotEmpty(name), "name", merchantBaseInfo.getAlias());
+        qW.like(StringUtils.isNotEmpty(name), "alias", name);
         qW.orderByDesc("id");
         Page<MerchantBaseInfo> merchantBaseInfoPage = merchantBaseInfoMapper.selectPage(page, qW);
         //组装
@@ -385,26 +397,28 @@ public class MerchantCashPlaceServiceImpl extends ServiceImpl<MerchantCashPlaceM
             cashPlaceVO.setTab(data.getTab());
             cashPlaceVOList.add(cashPlaceVO);
         }
-        //放入自己
-        MerchantCashPlaceVO cashPlaceVOMy = new MerchantCashPlaceVO();
-        cashPlaceVOMy.setName(merchantBaseInfo.getAlias());
-        cashPlaceVOMy.setCode(merchantBaseInfo.getMerchantCode());
-        cashPlaceVOMy.setAddress(merchantBaseInfo.getAddress());
-        cashPlaceVOMy.setCreateTime(merchantBaseInfo.getCreateDt());
-        cashPlaceVOMy.setMerchantBaseInfo(merchantBaseInfo);
-        cashPlaceVOMy.setTab(merchantBaseInfo.getTab());
-        cashPlaceVOList.add(cashPlaceVOMy);
-        //如果全为0,默认是用户号
-        boolean allZero = true;
-        for (MerchantCashPlaceVO vo : cashPlaceVOList) {
-            if (vo.getTab() != 0) {
-                allZero = false;
-                break;
+        if (name == null) {
+            //放入自己
+            MerchantCashPlaceVO cashPlaceVOMy = new MerchantCashPlaceVO();
+            cashPlaceVOMy.setName(merchantBaseInfo.getAlias());
+            cashPlaceVOMy.setCode(merchantBaseInfo.getMerchantCode());
+            cashPlaceVOMy.setAddress(merchantBaseInfo.getAddress());
+            cashPlaceVOMy.setCreateTime(merchantBaseInfo.getCreateDt());
+            cashPlaceVOMy.setMerchantBaseInfo(merchantBaseInfo);
+            cashPlaceVOMy.setTab(merchantBaseInfo.getTab());
+            cashPlaceVOList.add(cashPlaceVOMy);
+            //如果全为0,默认是用户号
+            boolean allZero = true;
+            for (MerchantCashPlaceVO vo : cashPlaceVOList) {
+                if (vo.getTab() != 0) {
+                    allZero = false;
+                    break;
+                }
             }
-        }
 
-        if (allZero && !cashPlaceVOList.isEmpty()) {
-            cashPlaceVOList.get(cashPlaceVOList.size() - 1).setTab(1);
+            if (allZero && !cashPlaceVOList.isEmpty()) {
+                cashPlaceVOList.get(cashPlaceVOList.size() - 1).setTab(1);
+            }
         }
         return cashPlaceVOList;
     }