Merge remote-tracking branch 'origin/master'

modules/admin/src/main/java/com/fire/admin/service/impl/ChannelGroupServiceImpl.java

@@ -58,7 +58,7 @@ public class ChannelGroupServiceImpl extends ServiceImpl<ChannelGroupMapper, Cha
     }
 
     /**
-     * @Description:  TODO 根据通道组的集合获取通道组id 和通道组名称，用与app  接入展示
+     * @Description: TODO 根据通道组的集合获取通道组id 和通道组名称，用与app  接入展示
      * @Param: [channelGroupIds]
      * @return: java.util.List<com.fire.dto.ChannelGroup>
      * @Author: liuliu
@@ -66,15 +66,14 @@ public class ChannelGroupServiceImpl extends ServiceImpl<ChannelGroupMapper, Cha
      */
     @Override
     public List<ChannelGroup> queryChannelGroup(List<Long> channelGroupIds) {
-        if(!channelGroupIds.isEmpty()){
+        List<ChannelGroup> channelGroups = null;
+        if (!channelGroupIds.isEmpty()) {
             LambdaQueryWrapper<ChannelGroup> wrapper = new LambdaQueryWrapper<>();
-            wrapper.select(ChannelGroup::getChannelGroupId,ChannelGroup::getGroupName)
-                    .in(ChannelGroup::getChannelGroupId,channelGroupIds);
-            return  baseMapper.selectList(wrapper);
-        }else {
-            // TODO 抛出请求参数不合法的异常
-            throw new BaseException(Status.REQUEST_PARAM_ERROR.status(),Status.REQUEST_PARAM_ERROR.message());
-        }
+            wrapper.select(ChannelGroup::getChannelGroupId, ChannelGroup::getGroupName)
+                    .in(ChannelGroup::getChannelGroupId, channelGroupIds);
+            channelGroups = baseMapper.selectList(wrapper);
 
+        }
+        return channelGroups;
     }
 }