fix

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

@@ -1042,7 +1042,9 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
         List<MemberRankSetting>   dataList = this.getDAO().queryPage(params);
-
+        if (CollectionUtils.isEmpty(dataList)) {
+            return new ArrayList<>();
+        }
 
         // 顶级查询所有，下级的查询自己和上级
         List<Integer> topIds = new ArrayList<>();
@@ -1056,11 +1058,16 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             }
         }
         // 查询上级
-        List<MemberRankSetting> parents = memberRankSettingDao.selectBatchIds(parentIds);
-        List<MemberRankSetting> tops = memberRankSettingDao.selectBatchIdsByParentIds(topIds);
+        if (CollectionUtils.isNotEmpty(parentIds)) {
+            List<MemberRankSetting> parents = memberRankSettingDao.selectBatchIds(parentIds);
+            dataList.addAll(parents);
+        }
+        if (CollectionUtils.isNotEmpty(topIds)) {
+            List<MemberRankSetting> tops = memberRankSettingDao.selectBatchIdsByParentIds(topIds);
+
+            dataList.addAll(tops);
+        }
 
-        dataList.addAll(parents);
-        dataList.addAll(tops);
         List<MemberRankSettingWrapper.MemberRankSetting> memberRankSettings = JSON.parseArray(JSON.toJSONString(dataList), MemberRankSettingWrapper.MemberRankSetting.class);
 
         // 设置曲目数量