Browse Source

家族申请列表去掉分页

Alex 4 years ago
parent
commit
66d4ea8b82

+ 7 - 11
ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyController.java

@@ -194,25 +194,21 @@ public class FamilyController extends AppBaseController {
 
 
     @ApiOperation("申请列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "familyId", value = "家族id",paramType="Long"),
-            @ApiImplicitParam(name = "pageNum", value = "当前页",paramType="int"),
-            @ApiImplicitParam(name = "pageSize", value = "每页行数",paramType="int")
-    })
+    @ApiImplicitParam(name = "familyId", value = "家族id",paramType="Long")
     @GetMapping("/selectApply")
-    public TableDataInfo selectApply(Long familyId,Integer pageNum,Integer pageSize){
+    public AjaxResult selectApply(Long familyId){
         if (familyId == null){
-            return new TableDataInfo();
+            return AjaxResult.error("家族id不能为空");
         }
-        pageNum = pageNum == null ? 1 : pageNum;
-        pageSize = pageSize == null ? 10 : pageSize;
-        PageHelper.startPage(pageNum, pageSize, "mi.create_time desc");
+//        pageNum = pageNum == null ? 1 : pageNum;
+//        pageSize = pageSize == null ? 10 : pageSize;
+//        PageHelper.startPage(pageNum, pageSize, "mi.create_time desc");
         // 获取申请列表 1申请 3拒绝 4退出
         List<TbMemberMiddle> list = middleService.selectApplyMember(new LambdaQueryWrapper<TbMemberMiddle>()
                 .eq(TbMemberMiddle::getFamilyId,familyId)
                 .in(TbMemberMiddle::getStatus, Arrays.asList("1","3","4"))
         );
-        return getDataTable(list);
+        return AjaxResult.success(list);
     }
 
     @ApiOperation("通过/拒绝申请")