瀏覽代碼

子集查询

刘俊驰 9 月之前
父節點
當前提交
a6c3c1b430

+ 2 - 2
mec-application/src/main/java/com/ym/mec/web/controller/MemberRankSettingController.java

@@ -89,9 +89,9 @@ public class MemberRankSettingController extends BaseController {
 
     @ApiOperation(value = "树状列表")
     @GetMapping("/categoryTree")
-    public HttpResponseResult<MemberRankSettingWrapper.Category> queryTree(@RequestParam(required = false) Integer parentId) {
+    public HttpResponseResult<MemberRankSettingWrapper.Category> queryTree(@RequestParam(required = false) Integer parentMemberId) {
 
-        return succeed(memberRankSettingService.getTree(parentId));
+        return succeed(memberRankSettingService.getTree(parentMemberId));
     }
 
     @ApiOperation(value = "获取所有会员列表")

+ 5 - 5
mec-biz/src/main/java/com/ym/mec/biz/dal/page/MemberPrivilegesItemQueryInfo.java

@@ -8,14 +8,14 @@ public class MemberPrivilegesItemQueryInfo extends QueryInfo {
     private Integer parentId = 0;
 
 
-    private Integer memberRankSettingId;
+    private Integer parentMemberId;
 
-    public Integer getMemberRankSettingId() {
-        return memberRankSettingId;
+    public Integer getParentMemberId() {
+        return parentMemberId;
     }
 
-    public void setMemberRankSettingId(Integer memberRankSettingId) {
-        this.memberRankSettingId = memberRankSettingId;
+    public void setParentMemberId(Integer parentMemberId) {
+        this.parentMemberId = parentMemberId;
     }
 
     public Integer getParentId() {

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

@@ -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());
-
             }
 
         }