Merge remote-tracking branch 'origin/master_saas' into master_saas

mec-common/common-core/src/main/java/com/ym/mec/common/page/PageInfo.java

@@ -167,6 +167,7 @@ public class PageInfo<T> implements Serializable {
 	}
 
 
+
     /**
      * <p>
      * IPage 的泛型转换

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherImLiveBroadcastRoomMemberController.java

@@ -78,13 +78,10 @@ public class TeacherImLiveBroadcastRoomMemberController extends BaseController {
         PageInfo<ImLiveBroadcastRoomMemberVo> roomMember = imLiveBroadcastRoomMemberService.queryRoomMember(
             param);
 
-        List<ImLiveBroadcastRoomMemberVo.ImLiveBroadcastRoomSimpleMemberVo> simpleMemberVos = roomMember.getRows().stream().map(
-            o -> o.getSimpleMemberVo(o)).collect(Collectors.toList());
+        PageInfo<ImLiveBroadcastRoomMemberVo.ImLiveBroadcastRoomSimpleMemberVo> convert = roomMember.convert(
+            o -> o.getSimpleMemberVo(o));
 
-
-        Page<ImLiveBroadcastRoomMemberVo.ImLiveBroadcastRoomSimpleMemberVo> pageInfo = PageUtil.getPageInfo(param);
-        pageInfo.setRecords(simpleMemberVos);
-        return succeed(PageUtil.pageInfo(pageInfo));
+        return succeed(convert);
     }
 }
 

mec-web/src/main/java/com/ym/mec/web/controller/ImLiveBroadcastRoomMemberController.java

@@ -77,13 +77,10 @@ public class ImLiveBroadcastRoomMemberController extends BaseController {
         PageInfo<ImLiveBroadcastRoomMemberVo> roomMember = imLiveBroadcastRoomMemberService.queryRoomMember(
             param);
 
-        List<ImLiveBroadcastRoomMemberVo.ImLiveBroadcastRoomSimpleMemberVo> simpleMemberVos = roomMember.getRows().stream().map(
-            o -> o.getSimpleMemberVo(o)).collect(Collectors.toList());
+        PageInfo<ImLiveBroadcastRoomMemberVo.ImLiveBroadcastRoomSimpleMemberVo> convert = roomMember.convert(
+            o -> o.getSimpleMemberVo(o));
 
-
-        Page<ImLiveBroadcastRoomMemberVo.ImLiveBroadcastRoomSimpleMemberVo> pageInfo = PageUtil.getPageInfo(param);
-        pageInfo.setRecords(simpleMemberVos);
-        return succeed(PageUtil.pageInfo(pageInfo));
+        return succeed(convert);
     }
 }