From 97b5e031d30aea1423d089bf02eb243ce57c1bd7 Mon Sep 17 00:00:00 2001 From: gxwebsoft Date: Wed, 13 Mar 2024 12:08:03 +0800 Subject: [PATCH] =?UTF-8?q?1=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E7=9A=84=E5=B8=83=E5=B1=80=E5=AD=97=E6=AE=B5layout?= =?UTF-8?q?=EF=BC=8C2=E8=B0=83=E6=95=B4=E5=8F=8B=E6=83=85=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gxwebsoft/cms/controller/DesignController.java | 8 ++------ src/main/java/com/gxwebsoft/cms/entity/Design.java | 4 ++++ .../com/gxwebsoft/oa/controller/LinkController.java | 10 ++-------- .../com/gxwebsoft/oa/service/impl/LinkServiceImpl.java | 4 ++-- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/gxwebsoft/cms/controller/DesignController.java b/src/main/java/com/gxwebsoft/cms/controller/DesignController.java index 9bedd08..5fd9ade 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/DesignController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/DesignController.java @@ -35,19 +35,15 @@ public class DesignController extends BaseController { @ApiOperation("查询全部页面管理记录表") @GetMapping() public ApiResult> list(DesignParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc,create_time desc"); - return success(designService.list(page.getOrderWrapper())); // 使用关联查询 - //return success(designService.listRel(param)); + return success(designService.listRel(param)); } @ApiOperation("根据id查询页面管理记录表") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { - return success(designService.getById(id)); // 使用关联查询 - //return success(designService.getByIdRel(id)); + return success(designService.getByIdRel(id)); } @ApiOperation("添加页面管理记录表") diff --git a/src/main/java/com/gxwebsoft/cms/entity/Design.java b/src/main/java/com/gxwebsoft/cms/entity/Design.java index a27518d..5b79e10 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/Design.java +++ b/src/main/java/com/gxwebsoft/cms/entity/Design.java @@ -3,6 +3,7 @@ package com.gxwebsoft.cms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -52,6 +53,9 @@ public class Design implements Serializable { @ApiModelProperty(value = "页面内容") private String content; + @ApiModelProperty(value = "页面布局") + private String layout; + @ApiModelProperty(value = "用户ID") private Integer userId; diff --git a/src/main/java/com/gxwebsoft/oa/controller/LinkController.java b/src/main/java/com/gxwebsoft/oa/controller/LinkController.java index 165338d..bc37de3 100644 --- a/src/main/java/com/gxwebsoft/oa/controller/LinkController.java +++ b/src/main/java/com/gxwebsoft/oa/controller/LinkController.java @@ -28,21 +28,15 @@ public class LinkController extends BaseController { @ApiOperation("分页查询常用链接") @GetMapping("/page") public ApiResult> page(LinkParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc,create_time desc"); - return success(linkService.page(page, page.getWrapper())); // 使用关联查询 - //return success(linkService.pageRel(param)); + return success(linkService.pageRel(param)); } @ApiOperation("查询全部常用链接") @GetMapping() public ApiResult> list(LinkParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc,create_time desc"); - return success(linkService.list(page.getOrderWrapper())); // 使用关联查询 - //return success(linkService.listRel(param)); + return success(linkService.listRel(param)); } @ApiOperation("根据id查询常用链接") diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/LinkServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/LinkServiceImpl.java index 508eb7f..cbb089a 100644 --- a/src/main/java/com/gxwebsoft/oa/service/impl/LinkServiceImpl.java +++ b/src/main/java/com/gxwebsoft/oa/service/impl/LinkServiceImpl.java @@ -23,7 +23,7 @@ public class LinkServiceImpl extends ServiceImpl implements Li @Override public PageResult pageRel(LinkParam param) { PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("sort_number asc,create_time desc"); List list = baseMapper.selectPageRel(page, param); return new PageResult<>(list, page.getTotal()); } @@ -33,7 +33,7 @@ public class LinkServiceImpl extends ServiceImpl implements Li List list = baseMapper.selectListRel(param); // 排序 PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("sort_number asc,create_time desc"); return page.sortRecords(list); }