首次自动部署

gis_cms/src/main/java/com/gis/cms/service/impl/CommentServiceImpl.java

@@ -39,17 +39,21 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, CommentEntity
 
     @Override
     public Result search(CommentPageDto param) {
+        return Result.success(getPage(param));
+    }
+
+    private IPage getPage(CommentPageDto param){
         BaseUtil.startPage(param);
         IPage<CommentEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
         BaseUtil.startPage(param);
 
         LambdaQueryWrapper<CommentEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(CommentEntity::getStatus, 2);
+        Integer status = param.getStatus();
+        wrapper.eq(status!=null, CommentEntity::getStatus, status);
         String searchKey = param.getSearchKey();
         wrapper.like(StringUtils.isNotBlank(searchKey), CommentEntity::getContent, searchKey);
         wrapper.orderByDesc(CommentEntity::getCreateTime);
-        IPage<CommentEntity> result = this.page(page, wrapper);
-        return Result.success(result);
+        return this.page(page, wrapper);
     }
 
 
@@ -65,19 +69,9 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, CommentEntity
 
     @Override
     public Result voListTree(CommentPageDto param) {
-        BaseUtil.startPage(param);
-        IPage page = new Page<>(param.getPageNum() , param.getPageSize());
-
-        LambdaQueryWrapper<CommentEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(CommentEntity::getStatus, 2);
-        String searchKey = param.getSearchKey();
-        wrapper.like(StringUtils.isNotBlank(searchKey), CommentEntity::getContent, searchKey);
-        wrapper.orderByDesc(CommentEntity::getCreateTime);
-        IPage result = this.page(page, wrapper);
-
+        IPage result = getPage(param);
         CommentTreeUtil tree = new CommentTreeUtil(result.getRecords());
         result.setRecords(tree.buildTree());
-
         return Result.success(result);
     }