刘俊驰 8 miesięcy temu
rodzic
commit
9d570293b1

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankOrganizationFeeMapperServiceImpl.java

@@ -114,7 +114,7 @@ public class MemberRankOrganizationFeeMapperServiceImpl extends BaseServiceImpl<
             List<MemberRankOrganizationFeeMapper> memberRankOrganizationFeeMappers = memberRankOrganizationFeeMapperDao.queryByOrganIds(Arrays.stream(query.getOrganIds().split(","))
                 .map(Integer::parseInt).collect(Collectors.toList()));
             if (query.getId() != null) {
-                memberRankOrganizationFeeMappers = memberRankOrganizationFeeMappers.stream().filter(o->o.getId().equals(query.getId())).collect(Collectors.toList());
+                memberRankOrganizationFeeMappers = memberRankOrganizationFeeMappers.stream().filter(o->!o.getId().equals(query.getId())).collect(Collectors.toList());
             }
             settingQuery.setRemoveIds(memberRankOrganizationFeeMappers.stream().map(MemberRankOrganizationFeeMapper::getMemberRankSettingId).collect(Collectors.toList()));
         }

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

@@ -192,6 +192,12 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         int count = cloudTeacherOrderDao.countByMemberRankSetttingId(memberRankSettingId);
         result.setBuyFlag(count > 0);
 
+        // 查询上级
+        if (memberRankSetting.getParentId() != null && memberRankSetting.getParentId() != 0) {
+            MemberRankSetting parent = memberRankSettingDao.get(memberRankSetting.getParentId());
+            result.setParentName(parent.getName());
+        }
+
         return result;
     }