1新增页面设计的布局字段layout，2调整友情链接排序问题

src/main/java/com/gxwebsoft/cms/controller/DesignController.java

@@ -35,19 +35,15 @@ public class DesignController extends BaseController {
     @ApiOperation("查询全部页面管理记录表")
     @GetMapping()
     public ApiResult<List<Design>> list(DesignParam param) {
-        PageParam<Design, DesignParam> 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<Design> get(@PathVariable("id") Integer id) {
-        return success(designService.getById(id));
         // 使用关联查询
-        //return success(designService.getByIdRel(id));
+        return success(designService.getByIdRel(id));
     }
 
     @ApiOperation("添加页面管理记录表")

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;
 

src/main/java/com/gxwebsoft/oa/controller/LinkController.java

@@ -28,21 +28,15 @@ public class LinkController extends BaseController {
     @ApiOperation("分页查询常用链接")
     @GetMapping("/page")
     public ApiResult<PageResult<Link>> page(LinkParam param) {
-        PageParam<Link, LinkParam> 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<Link>> list(LinkParam param) {
-        PageParam<Link, LinkParam> 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查询常用链接")

src/main/java/com/gxwebsoft/oa/service/impl/LinkServiceImpl.java

@@ -23,7 +23,7 @@ public class LinkServiceImpl extends ServiceImpl<LinkMapper, Link> implements Li
     @Override
     public PageResult<Link> pageRel(LinkParam param) {
         PageParam<Link, LinkParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sort_number asc,create_time desc");
         List<Link> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class LinkServiceImpl extends ServiceImpl<LinkMapper, Link> implements Li
         List<Link> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<Link, LinkParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sort_number asc,create_time desc");
         return page.sortRecords(list);
     }