|
@@ -3,14 +3,12 @@ package com.ym.mec.biz.service.impl;
|
|
|
import com.ym.mec.biz.dal.dao.MemberPrivilegesItemDao;
|
|
|
import com.ym.mec.biz.dal.dao.MemberRankPrivilegesDao;
|
|
|
import com.ym.mec.biz.dal.entity.MemberPrivilegesItem;
|
|
|
-import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
|
|
|
import com.ym.mec.biz.dal.page.MemberPrivilegesItemQueryInfo;
|
|
|
import com.ym.mec.biz.dal.wrapper.MemberRankSettingWrapper;
|
|
|
import com.ym.mec.biz.service.MemberPrivilegesItemService;
|
|
|
import com.ym.mec.biz.service.MemberRankSettingService;
|
|
|
import com.ym.mec.common.dal.BaseDAO;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
-import com.ym.mec.common.filters.TenantIdThreadLocal;
|
|
|
import com.ym.mec.common.page.PageInfo;
|
|
|
import com.ym.mec.common.service.impl.BaseServiceImpl;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
@@ -119,11 +117,10 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
|
|
|
}
|
|
|
|
|
|
// 如果是有学练宝ID 只返回学练宝数据
|
|
|
- if (queryInfo.getMemberRankSettingId() != null) {
|
|
|
- MemberRankSettingWrapper.MemberRankSetting detail = memberRankSettingService.getDetail(queryInfo.getMemberRankSettingId());
|
|
|
+ if (queryInfo.getParentMemberId() != null) {
|
|
|
+ MemberRankSettingWrapper.MemberRankSetting detail = memberRankSettingService.getDetail(queryInfo.getParentMemberId());
|
|
|
if (detail != null && CollectionUtils.isNotEmpty(detail.getMemberPrivilegesItemIdList())) {
|
|
|
return getTreeByIds(rows, detail.getMemberPrivilegesItemIdList());
|
|
|
-
|
|
|
}
|
|
|
|
|
|
}
|