Merge branch 'feature/0529-live' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -2017,7 +2017,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             //获取学员基本信息
             List<Integer> userIds = dataList.stream().map(e -> e.getId()).collect(Collectors.toList());
             List<Integer> subjectIds = dataList.stream().map(e -> e.getSubjectId()).collect(Collectors.toList());
-            List<SimpleUserDto> usersSimpleInfo = teacherDao.getUsersSimpleInfo(userIds);
+
+            List<SimpleUserDto> usersSimpleInfo = new ArrayList<>();
+            if (!CollectionUtils.isEmpty(userIds)) {
+                usersSimpleInfo = teacherDao.getUsersSimpleInfo(userIds);
+            }
             Map<Integer, SimpleUserDto> studentInfoMap = usersSimpleInfo.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, s -> s, (s1, s2) -> s1));
             List<Integer> organIds = usersSimpleInfo.stream().map(e -> Integer.parseInt(e.getOrganIds())).collect(Collectors.toList());
             Map<Integer, String> organMap = getMap("organization", "id_", "name_", organIds,queryInfo.getTenantId(), Integer.class, String.class);