fix 学练宝分部价格设置

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

@@ -96,32 +96,35 @@ public class MemberRankSettingController extends BaseController {
     @ApiOperation(value = "获取所有会员列表")
     @PostMapping("/findByOrganIds")
     @PreAuthorize("@pcs.hasPermissions('memberRankSetting/findByOrganIds')")
-    public HttpResponseResult<List<MemberRankSetting>> findAll(@RequestBody List<Integer> organIds) {
+    public HttpResponseResult<List<MemberRankSetting>> findAll(@RequestBody List<Integer> organIds,
+                                                               @RequestParam(required = false, defaultValue = "false") Boolean organFeeFlag) {
 
         // 根据分部ID查询对应的会员等级
         List<MemberRankSetting> memberRanks = memberRankSettingService.findByOrganIds(organIds);
 
         // 根据分部ID查询对应价格
-        MemberRankFeeQueryInfo queryInfo = new MemberRankFeeQueryInfo();
-        queryInfo.setRows(1000);
-        queryInfo.setPage(1);
-        if (CollectionUtils.isNotEmpty(organIds)) {
-            queryInfo.setOrganId(StringUtils.join(organIds, ","));
-        }
-        List<MemberRankOrganizationFeeMapper> rows = memberRankOrganizationFeeMapperService.queryPage(queryInfo).getRows();
-        if (CollectionUtils.isNotEmpty(rows)) {
-            Map<Integer, MemberFeeSetting> collect = rows.stream()
-                .collect(Collectors.toMap(MemberRankOrganizationFeeMapper::getMemberRankSettingId, MemberRankOrganizationFeeMapper::getMemberFeeSetting, (o, n) -> n));
-
-            // 已统一规定会员等级只有两级，暂不考虑多级
-            for (MemberRankSetting item : memberRanks) {
-                if (CollectionUtils.isEmpty(item.getChildren())) {
-                    continue;
-                }
-
-                // 设置价格
-                for (MemberRankSetting child : item.getChildren()) {
-                    child.setMemberFeeSetting(collect.get(child.getId()));
+        if (Boolean.TRUE.equals(organFeeFlag)) {
+            MemberRankFeeQueryInfo queryInfo = new MemberRankFeeQueryInfo();
+            queryInfo.setRows(1000);
+            queryInfo.setPage(1);
+            if (CollectionUtils.isNotEmpty(organIds)) {
+                queryInfo.setOrganId(StringUtils.join(organIds, ","));
+            }
+            List<MemberRankOrganizationFeeMapper> rows = memberRankOrganizationFeeMapperService.queryPage(queryInfo).getRows();
+            if (CollectionUtils.isNotEmpty(rows)) {
+                Map<Integer, MemberFeeSetting> collect = rows.stream()
+                    .collect(Collectors.toMap(MemberRankOrganizationFeeMapper::getMemberRankSettingId, MemberRankOrganizationFeeMapper::getMemberFeeSetting, (o, n) -> n));
+
+                // 已统一规定会员等级只有两级，暂不考虑多级
+                for (MemberRankSetting item : memberRanks) {
+                    if (CollectionUtils.isEmpty(item.getChildren())) {
+                        continue;
+                    }
+
+                    // 设置价格
+                    for (MemberRankSetting child : item.getChildren()) {
+                        child.setMemberFeeSetting(collect.get(child.getId()));
+                    }
                 }
             }
         }