改子集数据

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

@@ -49,23 +49,20 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 	}
 
 
-    private List<MemberPrivilegesItem> getTreeByIds(List<MemberPrivilegesItem> memberPrivilegesItems, List<Integer> ids) {
+    private void getTreeByIds(List<MemberPrivilegesItem> memberPrivilegesItems, List<Integer> ids) {
         if (CollectionUtils.isEmpty(memberPrivilegesItems)) {
-            return new ArrayList<>();
+            return ;
         }
-        List<MemberPrivilegesItem> list = new ArrayList<>();
-        for (MemberPrivilegesItem memberPrivilegesItem : memberPrivilegesItems) {
-            if (ids.contains(memberPrivilegesItem.getId())) {
-                list.add(memberPrivilegesItem);
+        for (int i = 0; i < memberPrivilegesItems.size(); i++) {
+            MemberPrivilegesItem memberPrivilegesItem = memberPrivilegesItems.get(i);
+            if (!ids.contains(memberPrivilegesItem.getId())) {
+                memberPrivilegesItems.remove(i);
+                i--;
             } else {
-                List<MemberPrivilegesItem> memberPrivilegesItemList = getTreeByIds(memberPrivilegesItem.getMemberPrivilegesItems(), ids);
-                if (CollectionUtils.isNotEmpty(memberPrivilegesItemList)) {
-                    memberPrivilegesItem.setMemberPrivilegesItems(memberPrivilegesItemList);
-                    list.add(memberPrivilegesItem);
-                }
+                getTreeByIds(memberPrivilegesItem.getMemberPrivilegesItems(), ids);
+
             }
         }
-        return list;
     }
 
     @Override
@@ -109,18 +106,18 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 	@Override
 	public List<MemberPrivilegesItem> findAllItem(MemberPrivilegesItemQueryInfo queryInfo) {
 		List<MemberPrivilegesItem> rows = memberPrivilegesItemDao.findList(queryInfo.getParentId());
-		if(rows == null || rows.size() == 0){
-			return rows;
-		}
-		for (MemberPrivilegesItem item : rows) {
-			item = getTree(item);
-		}
-
+        if(rows == null || rows.size() == 0){
+            return rows;
+        }
+        for (MemberPrivilegesItem item : rows) {
+            item = getTree(item);
+        }
         // 如果是有学练宝ID 只返回学练宝数据
         if (queryInfo.getParentMemberId() != null) {
             MemberRankSettingWrapper.MemberRankSetting detail = memberRankSettingService.getDetail(queryInfo.getParentMemberId());
             if (detail != null && CollectionUtils.isNotEmpty(detail.getMemberPrivilegesItemIdList())) {
-                return getTreeByIds(rows, detail.getMemberPrivilegesItemIdList());
+                getTreeByIds(rows, detail.getMemberPrivilegesItemIdList());
+                return rows;
             }
 
         }

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

@@ -545,7 +545,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 sysMusicScoreCategories = new ArrayList<>();
             }
             // 将被使用过的选出来
-            sysMusicScoreCategories = getCategoryTreeByIds(sysMusicScoreCategories,memberCategoryIdList);
+            getCategoryTreeByIds(sysMusicScoreCategories,memberCategoryIdList);
             category.setMusicScoreCategories(sysMusicScoreCategories);
 
             List<String> memberCourseTypeList = detail.getMemberCourseTypeList();
@@ -580,23 +580,19 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 
     }
 
-    private List<SysMusicScoreCategories> getCategoryTreeByIds(List<SysMusicScoreCategories> sysMusicScoreCategories, List<Integer> memberCategoryIdList) {
+    private void getCategoryTreeByIds(List<SysMusicScoreCategories> sysMusicScoreCategories, List<Integer> memberCategoryIdList) {
         if (CollectionUtils.isEmpty(sysMusicScoreCategories)) {
-            return new ArrayList<>();
+            return ;
         }
-        List<SysMusicScoreCategories> list = new ArrayList<>();
-        for (SysMusicScoreCategories sysMusicScoreCategory : sysMusicScoreCategories) {
-            if (memberCategoryIdList.contains(sysMusicScoreCategory.getId())) {
-                list.add(sysMusicScoreCategory);
+        for (int i = 0; i < sysMusicScoreCategories.size(); i++) {
+            SysMusicScoreCategories sysMusicScoreCategory = sysMusicScoreCategories.get(i);
+            if (!memberCategoryIdList.contains(sysMusicScoreCategory.getId())) {
+                sysMusicScoreCategories.remove(i);
+                i--;
             } else {
-                List<SysMusicScoreCategories> sysMusicScoreCategories1 = getCategoryTreeByIds(sysMusicScoreCategory.getSysMusicScoreCategoriesList(), memberCategoryIdList);
-                if (CollectionUtils.isNotEmpty(sysMusicScoreCategories1)) {
-                    sysMusicScoreCategory.setSysMusicScoreCategoriesList(sysMusicScoreCategories1);
-                    list.add(sysMusicScoreCategory);
-                }
+                getCategoryTreeByIds(sysMusicScoreCategory.getSysMusicScoreCategoriesList(), memberCategoryIdList);
             }
         }
-        return list;
     }