diff --git a/src/main/java/com/fc/v2/controller/admin/PermissionController.java b/src/main/java/com/fc/v2/controller/admin/PermissionController.java index f11ddc7232bb69e98b489eb12d253434a4fccf5f..993325064db5463907bede693b7a49612bebd6cf 100644 --- a/src/main/java/com/fc/v2/controller/admin/PermissionController.java +++ b/src/main/java/com/fc/v2/controller/admin/PermissionController.java @@ -9,8 +9,6 @@ import com.fc.v2.model.auto.TSysPermission; import com.fc.v2.model.custom.Tablepar; import com.fc.v2.shiro.util.ShiroUtils; import com.fc.v2.util.StringUtils; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -24,7 +22,7 @@ import java.util.List; /** * 权限Controller - * + * * @author fuce * @date: 2018年9月2日 下午8:08:21 */ @@ -59,7 +57,7 @@ public class PermissionController extends BaseController { * @return */ @ApiOperation(value = "分页查询", notes = "分页查询") - @PostMapping("/list") + @GetMapping("/list") @RequiresPermissions("system:permission:list") @ResponseBody public ResultTable list(Tablepar tablepar, String searchText) { @@ -68,9 +66,7 @@ public class PermissionController extends BaseController { queryWrapper.orderByAsc("order_num"); queryWrapper.like(StringUtils.isNotEmpty(searchText), "order_num", searchText); - //PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - List list= sysPermissionService.selectTSysPermissionList(queryWrapper); - //PageInfo page = new PageInfo(list); + List list = sysPermissionService.selectTSysPermissionList(queryWrapper); return treeTable(list); } diff --git a/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java b/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java index beb33ba4e9dd3cca66d1f08111767c38bac12476..bec4aef038e0cb10d2a515c88ef7d52ea8287714 100644 --- a/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java +++ b/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java @@ -10,8 +10,6 @@ import com.fc.v2.model.custom.Tablepar; import com.fc.v2.common.domain.ResuTree; import com.fc.v2.service.ITSysDepartmentService; import com.fc.v2.util.StringUtils; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -69,14 +67,13 @@ public class SysDepartmentController extends BaseController { queryWrapper.orderByAsc(tablepar.getOrderByColumn()); } - PageHelper.startPage(tablepar.getPage(), tablepar.getLimit()); - PageInfo page = new PageInfo(sysDepartmentService.selectTSysDepartmentList(queryWrapper)); - return treeTable(page.getList()); + List list = sysDepartmentService.selectTSysDepartmentList(queryWrapper); + return treeTable(list); } /** * 新增 - * + * * @param modelMap * @return */ @@ -166,7 +163,7 @@ public class SysDepartmentController extends BaseController { /** * 修改保存 - * + * * @param record * @return */ @@ -181,7 +178,6 @@ public class SysDepartmentController extends BaseController { /** - * * @return */ @GetMapping("/selectParent") @@ -207,7 +203,7 @@ public class SysDepartmentController extends BaseController { /** * 获取部门树状数据结构 - * + * * @return */ @GetMapping("tree") diff --git a/src/main/java/com/fc/v2/model/auto/TSysDepartment.java b/src/main/java/com/fc/v2/model/auto/TSysDepartment.java index 81bf017a90aec9e7372768a1b305ca847c8d8bd0..fc19aa869b7b69162822879e9f9a43adced3ee01 100644 --- a/src/main/java/com/fc/v2/model/auto/TSysDepartment.java +++ b/src/main/java/com/fc/v2/model/auto/TSysDepartment.java @@ -30,6 +30,7 @@ public class TSysDepartment extends BaseEntity /** 父id */ @ApiModelProperty(value = "父id") + @JsonSerialize(using = ToStringSerializer.class) private Long parentId; /** 部门名称 */ diff --git a/src/main/java/com/fc/v2/model/auto/TSysPermission.java b/src/main/java/com/fc/v2/model/auto/TSysPermission.java index 50ca670689126e18dbfe1d4bb155fd60929f9bc1..d1b89f8cec649c7cb7e8b4007f5e8badb8cae86e 100644 --- a/src/main/java/com/fc/v2/model/auto/TSysPermission.java +++ b/src/main/java/com/fc/v2/model/auto/TSysPermission.java @@ -37,6 +37,7 @@ public class TSysPermission extends BaseEntity private Integer isBlank; /** 父节点id */ + @JsonSerialize(using = ToStringSerializer.class) private Long pid; /** 权限标识 */ diff --git a/src/main/java/com/fc/v2/model/auto/TSysPermissionRole.java b/src/main/java/com/fc/v2/model/auto/TSysPermissionRole.java index 7ed7253881f5e4df6a66893195400b83e9ecbc38..99a7d7197ee3c2e97b3a0967c9483af395d9022e 100644 --- a/src/main/java/com/fc/v2/model/auto/TSysPermissionRole.java +++ b/src/main/java/com/fc/v2/model/auto/TSysPermissionRole.java @@ -25,9 +25,11 @@ public class TSysPermissionRole extends BaseEntity private Long id; /** 角色id */ + @JsonSerialize(using = ToStringSerializer.class) private Long roleId; /** 权限id */ + @JsonSerialize(using = ToStringSerializer.class) private Long permissionId; public void setId(Long id) diff --git a/src/main/resources/templates/admin/permission/list.html b/src/main/resources/templates/admin/permission/list.html index e259ab0611b0b845a0e2e9b8e28fb05d72d81c7a..bcb520f4ba4038bca3eccf7e12670b992c471bc9 100644 --- a/src/main/resources/templates/admin/permission/list.html +++ b/src/main/resources/templates/admin/permission/list.html @@ -77,34 +77,30 @@ let MODULE_PATH = rootPath+"/PermissionController/"; - window.render = function () { - treetable.render({ - treeColIndex: 1, - treeSpid: 0, - treeIdName: 'id', - treePidName: 'parentId', - skin: 'line', - method: 'post', - treeDefaultClose: true, - toolbar: '#power-toolbar', - elem: '#power-table', - url: MODULE_PATH+'list', - page: false, - cols: [ - [ - {type: 'checkbox'}, - {field: 'name', minWidth: 200, title: '权限名称'}, - {field: 'icon', title: '图标', templet: '#icon'}, - {field: 'type', title: '权限类型', templet: '#power-type'}, - {field: 'visible', title: '是否可用', templet: '#power-enable'}, - {field: 'orderNum', title: '排序'}, - {title: '操作', templet: '#power-bar', width: 150, align: 'center'} - ] + treetable.render({ + treeColIndex: 1, + treeSpid: 0, + treeIdName: 'id', + treePidName: 'pid', + skin: 'line', + method: 'post', + treeDefaultClose: true, + toolbar: '#power-toolbar', + elem: '#power-table', + url: MODULE_PATH+'list', + page: false, + cols: [ + [ + {type: 'checkbox'}, + {field: 'name', minWidth: 200, title: '权限名称'}, + {field: 'icon', title: '图标', templet: '#icon'}, + {field: 'type', title: '权限类型', templet: '#power-type'}, + {field: 'visible', title: '是否可用', templet: '#power-enable'}, + {field: 'orderNum', title: '排序'}, + {title: '操作', templet: '#power-bar', width: 150, align: 'center'} ] - }); - } - - render(); + ] + }); form.on('submit(power-query)', function (data) { var keyword = data.field.powerName; diff --git a/src/main/resources/templates/admin/sysDepartment/list.html b/src/main/resources/templates/admin/sysDepartment/list.html index 02369331c713ab6178d8dd80d6fc2e3ed167ffc1..748eea3564da69083f3cd4a459e549381b3e2d23 100644 --- a/src/main/resources/templates/admin/sysDepartment/list.html +++ b/src/main/resources/templates/admin/sysDepartment/list.html @@ -66,35 +66,31 @@ let MODULE_PATH = rootPath+"/SysDepartmentController/"; - window.render = function () { - treetable.render({ - treeColIndex: 1, - treeSpid: 0, - treeIdName: 'id', - treePidName: 'parentId', - skin: 'line', - method: 'get', - treeDefaultClose: true, - toolbar: '#department-toolbar', - elem: '#department-table', - url: MODULE_PATH+'list', - page: false, - cols: [ - [ - {type: 'checkbox'}, - {field: 'deptName', minWidth: 200, title: '部门名称'}, - {field: 'leader', title: '部门负责人'}, - {field: 'phone', title: '电话'}, - {field: 'email', title: '邮箱'}, - {field: 'status', title: '状态',templet: '#department-enable'}, - {field: 'orderNum', title: '排序'}, - {title: '操作', templet: '#department-bar', width: 150, align: 'center'} - ] + treetable.render({ + treeColIndex: 1, + treeSpid: 0, + treeIdName: 'id', + treePidName: 'parentId', + skin: 'line', + method: 'get', + treeDefaultClose: true, + toolbar: '#department-toolbar', + elem: '#department-table', + url: MODULE_PATH+'list', + page: false, + cols: [ + [ + {type: 'checkbox'}, + {field: 'deptName', minWidth: 200, title: '部门名称'}, + {field: 'leader', title: '部门负责人'}, + {field: 'phone', title: '电话'}, + {field: 'email', title: '邮箱'}, + {field: 'status', title: '状态',templet: '#department-enable'}, + {field: 'orderNum', title: '排序'}, + {title: '操作', templet: '#department-bar', width: 150, align: 'center'} ] - }); - } - - render(); + ] + }); form.on('submit(department-query)', function (data) { var keyword = data.field.powerName;