diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java index 58f8edecf..f9074fad1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java @@ -37,8 +37,8 @@ public class SysConfigController extends BaseController { */ @SaCheckPermission("system:config:list") @GetMapping("/list") - public TableDataInfo list(SysConfigBo bo, PageQuery pageQuery) { - return configService.selectPageConfigList(bo, pageQuery); + public TableDataInfo list(SysConfigBo config, PageQuery pageQuery) { + return configService.selectPageConfigList(config, pageQuery); } /** @@ -47,8 +47,8 @@ public class SysConfigController extends BaseController { @Log(title = "参数管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:config:export") @PostMapping("/export") - public void export(SysConfigBo bo, HttpServletResponse response) { - List list = configService.selectConfigList(bo); + public void export(SysConfigBo config, HttpServletResponse response) { + List list = configService.selectConfigList(config); ExcelUtil.exportExcel(list, "参数数据", SysConfigVo.class, response); } @@ -79,11 +79,11 @@ public class SysConfigController extends BaseController { @SaCheckPermission("system:config:add") @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysConfigBo bo) { - if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(bo))) { - return R.fail("新增参数'" + bo.getConfigName() + "'失败,参数键名已存在"); + public R add(@Validated @RequestBody SysConfigBo config) { + if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) { + return R.fail("新增参数'" + config.getConfigName() + "'失败,参数键名已存在"); } - configService.insertConfig(bo); + configService.insertConfig(config); return R.ok(); } @@ -93,11 +93,11 @@ public class SysConfigController extends BaseController { @SaCheckPermission("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysConfigBo bo) { - if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(bo))) { - return R.fail("修改参数'" + bo.getConfigName() + "'失败,参数键名已存在"); + public R edit(@Validated @RequestBody SysConfigBo config) { + if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) { + return R.fail("修改参数'" + config.getConfigName() + "'失败,参数键名已存在"); } - configService.updateConfig(bo); + configService.updateConfig(config); return R.ok(); } @@ -107,8 +107,8 @@ public class SysConfigController extends BaseController { @SaCheckPermission("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping("/updateByKey") - public R updateByKey(@RequestBody SysConfigBo bo) { - configService.updateConfig(bo); + public R updateByKey(@RequestBody SysConfigBo config) { + configService.updateConfig(config); return R.ok(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDeptController.java index 063e66bca..316497c81 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDeptController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDeptController.java @@ -35,8 +35,8 @@ public class SysDeptController extends BaseController { */ @SaCheckPermission("system:dept:list") @GetMapping("/list") - public R> list(SysDeptBo bo) { - List depts = deptService.selectDeptList(bo); + public R> list(SysDeptBo dept) { + List depts = deptService.selectDeptList(dept); return R.ok(depts); } @@ -72,11 +72,11 @@ public class SysDeptController extends BaseController { @SaCheckPermission("system:dept:add") @Log(title = "部门管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysDeptBo bo) { - if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(bo))) { - return R.fail("新增部门'" + bo.getDeptName() + "'失败,部门名称已存在"); + public R add(@Validated @RequestBody SysDeptBo dept) { + if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { + return R.fail("新增部门'" + dept.getDeptName() + "'失败,部门名称已存在"); } - return toAjax(deptService.insertDept(bo)); + return toAjax(deptService.insertDept(dept)); } /** @@ -85,18 +85,18 @@ public class SysDeptController extends BaseController { @SaCheckPermission("system:dept:edit") @Log(title = "部门管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysDeptBo bo) { - Long deptId = bo.getDeptId(); + public R edit(@Validated @RequestBody SysDeptBo dept) { + Long deptId = dept.getDeptId(); deptService.checkDeptDataScope(deptId); - if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(bo))) { - return R.fail("修改部门'" + bo.getDeptName() + "'失败,部门名称已存在"); - } else if (bo.getParentId().equals(deptId)) { - return R.fail("修改部门'" + bo.getDeptName() + "'失败,上级部门不能是自己"); - } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, bo.getStatus()) + if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { + return R.fail("修改部门'" + dept.getDeptName() + "'失败,部门名称已存在"); + } else if (dept.getParentId().equals(deptId)) { + return R.fail("修改部门'" + dept.getDeptName() + "'失败,上级部门不能是自己"); + } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) { return R.fail("该部门包含未停用的子部门!"); } - return toAjax(deptService.updateDept(bo)); + return toAjax(deptService.updateDept(dept)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java index 4ab246a70..68bbe8bad 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java @@ -41,8 +41,8 @@ public class SysDictDataController extends BaseController { */ @SaCheckPermission("system:dict:list") @GetMapping("/list") - public TableDataInfo list(SysDictDataBo bo, PageQuery pageQuery) { - return dictDataService.selectPageDictDataList(bo, pageQuery); + public TableDataInfo list(SysDictDataBo dictData, PageQuery pageQuery) { + return dictDataService.selectPageDictDataList(dictData, pageQuery); } /** @@ -51,8 +51,8 @@ public class SysDictDataController extends BaseController { @Log(title = "字典数据", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") - public void export(SysDictDataBo bo, HttpServletResponse response) { - List list = dictDataService.selectDictDataList(bo); + public void export(SysDictDataBo dictData, HttpServletResponse response) { + List list = dictDataService.selectDictDataList(dictData); ExcelUtil.exportExcel(list, "字典数据", SysDictDataVo.class, response); } @@ -87,8 +87,8 @@ public class SysDictDataController extends BaseController { @SaCheckPermission("system:dict:add") @Log(title = "字典数据", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysDictDataBo bo) { - dictDataService.insertDictData(bo); + public R add(@Validated @RequestBody SysDictDataBo dictData) { + dictDataService.insertDictData(dictData); return R.ok(); } @@ -98,8 +98,8 @@ public class SysDictDataController extends BaseController { @SaCheckPermission("system:dict:edit") @Log(title = "字典数据", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysDictDataBo bo) { - dictDataService.updateDictData(bo); + public R edit(@Validated @RequestBody SysDictDataBo dictData) { + dictDataService.updateDictData(dictData); return R.ok(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java index 37ad69d4f..b1d3b597b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java @@ -38,8 +38,8 @@ public class SysDictTypeController extends BaseController { */ @SaCheckPermission("system:dict:list") @GetMapping("/list") - public TableDataInfo list(SysDictTypeBo bo, PageQuery pageQuery) { - return dictTypeService.selectPageDictTypeList(bo, pageQuery); + public TableDataInfo list(SysDictTypeBo dictType, PageQuery pageQuery) { + return dictTypeService.selectPageDictTypeList(dictType, pageQuery); } /** @@ -70,11 +70,11 @@ public class SysDictTypeController extends BaseController { @SaCheckPermission("system:dict:add") @Log(title = "字典类型", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysDictTypeBo bo) { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(bo))) { - return R.fail("新增字典'" + bo.getDictName() + "'失败,字典类型已存在"); + public R add(@Validated @RequestBody SysDictTypeBo dictType) { + if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dictType))) { + return R.fail("新增字典'" + dictType.getDictName() + "'失败,字典类型已存在"); } - dictTypeService.insertDictType(bo); + dictTypeService.insertDictType(dictType); return R.ok(); } @@ -84,11 +84,11 @@ public class SysDictTypeController extends BaseController { @SaCheckPermission("system:dict:edit") @Log(title = "字典类型", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysDictTypeBo bo) { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(bo))) { - return R.fail("修改字典'" + bo.getDictName() + "'失败,字典类型已存在"); + public R edit(@Validated @RequestBody SysDictTypeBo dictType) { + if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dictType))) { + return R.fail("修改字典'" + dictType.getDictName() + "'失败,字典类型已存在"); } - dictTypeService.updateDictType(bo); + dictTypeService.updateDictType(dictType); return R.ok(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java index 60b89e3b4..0671abe07 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java @@ -83,13 +83,13 @@ public class SysMenuController extends BaseController { @SaCheckPermission("system:menu:add") @Log(title = "菜单管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysMenuBo bo) { - if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(bo))) { - return R.fail("新增菜单'" + bo.getMenuName() + "'失败,菜单名称已存在"); - } else if (UserConstants.YES_FRAME.equals(bo.getIsFrame()) && !StringUtils.ishttp(bo.getPath())) { - return R.fail("新增菜单'" + bo.getMenuName() + "'失败,地址必须以http(s)://开头"); + public R add(@Validated @RequestBody SysMenuBo menu) { + if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { + return R.fail("新增菜单'" + menu.getMenuName() + "'失败,菜单名称已存在"); + } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { + return R.fail("新增菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头"); } - return toAjax(menuService.insertMenu(bo)); + return toAjax(menuService.insertMenu(menu)); } /** @@ -98,15 +98,15 @@ public class SysMenuController extends BaseController { @SaCheckPermission("system:menu:edit") @Log(title = "菜单管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysMenuBo bo) { - if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(bo))) { - return R.fail("修改菜单'" + bo.getMenuName() + "'失败,菜单名称已存在"); - } else if (UserConstants.YES_FRAME.equals(bo.getIsFrame()) && !StringUtils.ishttp(bo.getPath())) { - return R.fail("修改菜单'" + bo.getMenuName() + "'失败,地址必须以http(s)://开头"); - } else if (bo.getMenuId().equals(bo.getParentId())) { - return R.fail("修改菜单'" + bo.getMenuName() + "'失败,上级菜单不能选择自己"); + public R edit(@Validated @RequestBody SysMenuBo menu) { + if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { + return R.fail("修改菜单'" + menu.getMenuName() + "'失败,菜单名称已存在"); + } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { + return R.fail("修改菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头"); + } else if (menu.getMenuId().equals(menu.getParentId())) { + return R.fail("修改菜单'" + menu.getMenuName() + "'失败,上级菜单不能选择自己"); } - return toAjax(menuService.updateMenu(bo)); + return toAjax(menuService.updateMenu(menu)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java index ebf1c6b70..7eb3b34d9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java @@ -32,8 +32,8 @@ public class SysNoticeController extends BaseController { */ @SaCheckPermission("system:notice:list") @GetMapping("/list") - public TableDataInfo list(SysNoticeBo bo, PageQuery pageQuery) { - return noticeService.selectPageNoticeList(bo, pageQuery); + public TableDataInfo list(SysNoticeBo notice, PageQuery pageQuery) { + return noticeService.selectPageNoticeList(notice, pageQuery); } /** @@ -53,8 +53,8 @@ public class SysNoticeController extends BaseController { @SaCheckPermission("system:notice:add") @Log(title = "通知公告", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysNoticeBo bo) { - return toAjax(noticeService.insertNotice(bo)); + public R add(@Validated @RequestBody SysNoticeBo notice) { + return toAjax(noticeService.insertNotice(notice)); } /** @@ -63,8 +63,8 @@ public class SysNoticeController extends BaseController { @SaCheckPermission("system:notice:edit") @Log(title = "通知公告", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysNoticeBo bo) { - return toAjax(noticeService.updateNotice(bo)); + public R edit(@Validated @RequestBody SysNoticeBo notice) { + return toAjax(noticeService.updateNotice(notice)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysPostController.java index 2b7b8b1eb..b4f20fe29 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysPostController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysPostController.java @@ -37,8 +37,8 @@ public class SysPostController extends BaseController { */ @SaCheckPermission("system:post:list") @GetMapping("/list") - public TableDataInfo list(SysPostBo bo, PageQuery pageQuery) { - return postService.selectPagePostList(bo, pageQuery); + public TableDataInfo list(SysPostBo post, PageQuery pageQuery) { + return postService.selectPagePostList(post, pageQuery); } /** @@ -47,8 +47,8 @@ public class SysPostController extends BaseController { @Log(title = "岗位管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:post:export") @PostMapping("/export") - public void export(SysPostBo bo, HttpServletResponse response) { - List list = postService.selectPostList(bo); + public void export(SysPostBo post, HttpServletResponse response) { + List list = postService.selectPostList(post); ExcelUtil.exportExcel(list, "岗位数据", SysPostVo.class, response); } @@ -69,13 +69,13 @@ public class SysPostController extends BaseController { @SaCheckPermission("system:post:add") @Log(title = "岗位管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysPostBo bo) { - if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(bo))) { - return R.fail("新增岗位'" + bo.getPostName() + "'失败,岗位名称已存在"); - } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(bo))) { - return R.fail("新增岗位'" + bo.getPostName() + "'失败,岗位编码已存在"); + public R add(@Validated @RequestBody SysPostBo post) { + if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { + return R.fail("新增岗位'" + post.getPostName() + "'失败,岗位名称已存在"); + } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { + return R.fail("新增岗位'" + post.getPostName() + "'失败,岗位编码已存在"); } - return toAjax(postService.insertPost(bo)); + return toAjax(postService.insertPost(post)); } /** @@ -84,13 +84,13 @@ public class SysPostController extends BaseController { @SaCheckPermission("system:post:edit") @Log(title = "岗位管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysPostBo bo) { - if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(bo))) { - return R.fail("修改岗位'" + bo.getPostName() + "'失败,岗位名称已存在"); - } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(bo))) { - return R.fail("修改岗位'" + bo.getPostName() + "'失败,岗位编码已存在"); + public R edit(@Validated @RequestBody SysPostBo post) { + if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { + return R.fail("修改岗位'" + post.getPostName() + "'失败,岗位名称已存在"); + } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { + return R.fail("修改岗位'" + post.getPostName() + "'失败,岗位编码已存在"); } - return toAjax(postService.updatePost(bo)); + return toAjax(postService.updatePost(post)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java index 7c975017f..87d6ca21d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java @@ -50,8 +50,8 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping("/list") - public TableDataInfo list(SysRoleBo bo, PageQuery pageQuery) { - return roleService.selectPageRoleList(bo, pageQuery); + public TableDataInfo list(SysRoleBo role, PageQuery pageQuery) { + return roleService.selectPageRoleList(role, pageQuery); } /** @@ -60,8 +60,8 @@ public class SysRoleController extends BaseController { @Log(title = "角色管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:role:export") @PostMapping("/export") - public void export(SysRoleBo bo, HttpServletResponse response) { - List list = roleService.selectRoleList(bo); + public void export(SysRoleBo role, HttpServletResponse response) { + List list = roleService.selectRoleList(role); ExcelUtil.exportExcel(list, "角色数据", SysRoleVo.class, response); } @@ -83,13 +83,13 @@ public class SysRoleController extends BaseController { @SaCheckPermission("system:role:add") @Log(title = "角色管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysRoleBo bo) { - if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(bo))) { - return R.fail("新增角色'" + bo.getRoleName() + "'失败,角色名称已存在"); - } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(bo))) { - return R.fail("新增角色'" + bo.getRoleName() + "'失败,角色权限已存在"); + public R add(@Validated @RequestBody SysRoleBo role) { + if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { + return R.fail("新增角色'" + role.getRoleName() + "'失败,角色名称已存在"); + } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { + return R.fail("新增角色'" + role.getRoleName() + "'失败,角色权限已存在"); } - return toAjax(roleService.insertRole(bo)); + return toAjax(roleService.insertRole(role)); } @@ -99,16 +99,16 @@ public class SysRoleController extends BaseController { @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysRoleBo bo) { - roleService.checkRoleAllowed(bo); - roleService.checkRoleDataScope(bo.getRoleId()); - if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(bo))) { - return R.fail("修改角色'" + bo.getRoleName() + "'失败,角色名称已存在"); - } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(bo))) { - return R.fail("修改角色'" + bo.getRoleName() + "'失败,角色权限已存在"); + public R edit(@Validated @RequestBody SysRoleBo role) { + roleService.checkRoleAllowed(role); + roleService.checkRoleDataScope(role.getRoleId()); + if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { + return R.fail("修改角色'" + role.getRoleName() + "'失败,角色名称已存在"); + } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { + return R.fail("修改角色'" + role.getRoleName() + "'失败,角色权限已存在"); } - if (roleService.updateRole(bo) > 0) { + if (roleService.updateRole(role) > 0) { // 更新缓存用户权限 LoginUser loginUser = LoginHelper.getLoginUser(); SysUser sysUser = userService.selectUserById(loginUser.getUserId()); @@ -118,7 +118,7 @@ public class SysRoleController extends BaseController { } return R.ok(); } - return R.fail("修改角色'" + bo.getRoleName() + "'失败,请联系管理员"); + return R.fail("修改角色'" + role.getRoleName() + "'失败,请联系管理员"); } /** @@ -127,10 +127,10 @@ public class SysRoleController extends BaseController { @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/dataScope") - public R dataScope(@RequestBody SysRoleBo bo) { - roleService.checkRoleAllowed(bo); - roleService.checkRoleDataScope(bo.getRoleId()); - return toAjax(roleService.authDataScope(bo)); + public R dataScope(@RequestBody SysRoleBo role) { + roleService.checkRoleAllowed(role); + roleService.checkRoleDataScope(role.getRoleId()); + return toAjax(roleService.authDataScope(role)); } /** @@ -139,10 +139,10 @@ public class SysRoleController extends BaseController { @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysRoleBo bo) { - roleService.checkRoleAllowed(bo); - roleService.checkRoleDataScope(bo.getRoleId()); - return toAjax(roleService.updateRoleStatus(bo)); + public R changeStatus(@RequestBody SysRoleBo role) { + roleService.checkRoleAllowed(role); + roleService.checkRoleDataScope(role.getRoleId()); + return toAjax(roleService.updateRoleStatus(role)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java index 4ac4f67a0..a998500ad 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java @@ -15,7 +15,7 @@ import java.util.List; public interface ISysConfigService { - TableDataInfo selectPageConfigList(SysConfigBo bo, PageQuery pageQuery); + TableDataInfo selectPageConfigList(SysConfigBo config, PageQuery pageQuery); /** * 查询参数配置信息 @@ -43,10 +43,10 @@ public interface ISysConfigService { /** * 查询参数配置列表 * - * @param bo 参数配置信息 + * @param config 参数配置信息 * @return 参数配置集合 */ - List selectConfigList(SysConfigBo bo); + List selectConfigList(SysConfigBo config); /** * 新增参数配置 @@ -89,9 +89,9 @@ public interface ISysConfigService { /** * 校验参数键名是否唯一 * - * @param bo 参数信息 + * @param config 参数信息 * @return 结果 */ - String checkConfigKeyUnique(SysConfigBo bo); + String checkConfigKeyUnique(SysConfigBo config); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java index a57c3c8e9..fc6641bc1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -16,10 +16,10 @@ public interface ISysDeptService { /** * 查询部门管理数据 * - * @param bo 部门信息 + * @param dept 部门信息 * @return 部门信息集合 */ - List selectDeptList(SysDeptBo bo); + List selectDeptList(SysDeptBo dept); /** * 查询部门树结构信息 @@ -80,10 +80,10 @@ public interface ISysDeptService { /** * 校验部门名称是否唯一 * - * @param bo 部门信息 + * @param dept 部门信息 * @return 结果 */ - String checkDeptNameUnique(SysDeptBo bo); + String checkDeptNameUnique(SysDeptBo dept); /** * 校验部门是否有数据权限 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java index 3300d8dc8..f8c8721f4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java @@ -15,15 +15,15 @@ import java.util.List; public interface ISysDictDataService { - TableDataInfo selectPageDictDataList(SysDictDataBo bo, PageQuery pageQuery); + TableDataInfo selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery); /** * 根据条件分页查询字典数据 * - * @param bo 字典数据信息 + * @param dictData 字典数据信息 * @return 字典数据集合信息 */ - List selectDictDataList(SysDictDataBo bo); + List selectDictDataList(SysDictDataBo dictData); /** * 根据字典类型和字典键值查询字典数据信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java index 72b9cda26..bd4b8d773 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java @@ -17,15 +17,15 @@ import java.util.List; public interface ISysDictTypeService { - TableDataInfo selectPageDictTypeList(SysDictTypeBo bo, PageQuery pageQuery); + TableDataInfo selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery); /** * 根据条件分页查询字典类型 * - * @param bo 字典类型信息 + * @param dictType 字典类型信息 * @return 字典类型集合信息 */ - List selectDictTypeList(SysDictTypeBo bo); + List selectDictTypeList(SysDictTypeBo dictType); /** * 根据所有字典类型 @@ -99,8 +99,8 @@ public interface ISysDictTypeService { /** * 校验字典类型称是否唯一 * - * @param bo 字典类型 + * @param dictType 字典类型 * @return 结果 */ - String checkDictTypeUnique(SysDictTypeBo bo); + String checkDictTypeUnique(SysDictTypeBo dictType); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java index 7602b6bc6..43f1a8669 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java @@ -132,8 +132,8 @@ public interface ISysMenuService { /** * 校验菜单名称是否唯一 * - * @param bo 菜单信息 + * @param menu 菜单信息 * @return 结果 */ - String checkMenuNameUnique(SysMenuBo bo); + String checkMenuNameUnique(SysMenuBo menu); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java index 3105ba135..02f9b807f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java @@ -15,7 +15,7 @@ import java.util.List; public interface ISysNoticeService { - TableDataInfo selectPageNoticeList(SysNoticeBo bo, PageQuery pageQuery); + TableDataInfo selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery); /** * 查询公告信息 @@ -28,10 +28,10 @@ public interface ISysNoticeService { /** * 查询公告列表 * - * @param bo 公告信息 + * @param notice 公告信息 * @return 公告集合 */ - List selectNoticeList(SysNoticeBo bo); + List selectNoticeList(SysNoticeBo notice); /** * 新增公告 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java index 9c318e34d..e7e89559e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java @@ -15,15 +15,15 @@ import java.util.List; public interface ISysPostService { - TableDataInfo selectPagePostList(SysPostBo bo, PageQuery pageQuery); + TableDataInfo selectPagePostList(SysPostBo post, PageQuery pageQuery); /** * 查询岗位信息集合 * - * @param bo 岗位信息 + * @param post 岗位信息 * @return 岗位列表 */ - List selectPostList(SysPostBo bo); + List selectPostList(SysPostBo post); /** * 查询所有岗位 @@ -51,18 +51,18 @@ public interface ISysPostService { /** * 校验岗位名称 * - * @param bo 岗位信息 + * @param post 岗位信息 * @return 结果 */ - String checkPostNameUnique(SysPostBo bo); + String checkPostNameUnique(SysPostBo post); /** * 校验岗位编码 * - * @param bo 岗位信息 + * @param post 岗位信息 * @return 结果 */ - String checkPostCodeUnique(SysPostBo bo); + String checkPostCodeUnique(SysPostBo post); /** * 通过岗位ID查询岗位使用数量 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java index eb277edc6..77f60037d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java @@ -17,15 +17,15 @@ import java.util.Set; public interface ISysRoleService { - TableDataInfo selectPageRoleList(SysRoleBo bo, PageQuery pageQuery); + TableDataInfo selectPageRoleList(SysRoleBo role, PageQuery pageQuery); /** * 根据条件分页查询角色数据 * - * @param bo 角色信息 + * @param role 角色信息 * @return 角色数据集合信息 */ - List selectRoleList(SysRoleBo bo); + List selectRoleList(SysRoleBo role); /** * 根据用户ID查询角色列表 @@ -69,25 +69,25 @@ public interface ISysRoleService { /** * 校验角色名称是否唯一 * - * @param bo 角色信息 + * @param role 角色信息 * @return 结果 */ - String checkRoleNameUnique(SysRoleBo bo); + String checkRoleNameUnique(SysRoleBo role); /** * 校验角色权限是否唯一 * - * @param bo 角色信息 + * @param role 角色信息 * @return 结果 */ - String checkRoleKeyUnique(SysRoleBo bo); + String checkRoleKeyUnique(SysRoleBo role); /** * 校验角色是否允许操作 * - * @param bo 角色信息 + * @param role 角色信息 */ - void checkRoleAllowed(SysRoleBo bo); + void checkRoleAllowed(SysRoleBo role); /** * 校验角色是否有数据权限 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index 16a5f4e2d..3104e1564 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -42,8 +42,8 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { private final SysConfigMapper baseMapper; @Override - public TableDataInfo selectPageConfigList(SysConfigBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public TableDataInfo selectPageConfigList(SysConfigBo config, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(config); Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -94,12 +94,12 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { /** * 查询参数配置列表 * - * @param bo 参数配置信息 + * @param config 参数配置信息 * @return 参数配置集合 */ @Override - public List selectConfigList(SysConfigBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List selectConfigList(SysConfigBo config) { + LambdaQueryWrapper lqw = buildQueryWrapper(config); return baseMapper.selectVoList(lqw); } @@ -205,13 +205,13 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { /** * 校验参数键名是否唯一 * - * @param bo 参数配置信息 + * @param config 参数配置信息 * @return 结果 */ @Override - public String checkConfigKeyUnique(SysConfigBo bo) { - long configId = ObjectUtil.isNull(bo.getConfigId()) ? -1L : bo.getConfigId(); - SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper().eq(SysConfig::getConfigKey, bo.getConfigKey())); + public String checkConfigKeyUnique(SysConfigBo config) { + long configId = ObjectUtil.isNull(config.getConfigId()) ? -1L : config.getConfigId(); + SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper().eq(SysConfig::getConfigKey, config.getConfigKey())); if (ObjectUtil.isNotNull(info) && info.getConfigId() != configId) { return UserConstants.NOT_UNIQUE; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 742f20ee8..8206bdc2a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -46,12 +46,12 @@ public class SysDeptServiceImpl implements ISysDeptService { /** * 查询部门管理数据 * - * @param bo 部门信息 + * @param dept 部门信息 * @return 部门信息集合 */ @Override - public List selectDeptList(SysDeptBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List selectDeptList(SysDeptBo dept) { + LambdaQueryWrapper lqw = buildQueryWrapper(dept); return baseMapper.selectDeptList(lqw); } @@ -166,15 +166,15 @@ public class SysDeptServiceImpl implements ISysDeptService { /** * 校验部门名称是否唯一 * - * @param bo 部门信息 + * @param dept 部门信息 * @return 结果 */ @Override - public String checkDeptNameUnique(SysDeptBo bo) { + public String checkDeptNameUnique(SysDeptBo dept) { boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysDept::getDeptName, bo.getDeptName()) - .eq(SysDept::getParentId, bo.getParentId()) - .ne(ObjectUtil.isNotNull(bo.getDeptId()), SysDept::getDeptId, bo.getDeptId())); + .eq(SysDept::getDeptName, dept.getDeptName()) + .eq(SysDept::getParentId, dept.getParentId()) + .ne(ObjectUtil.isNotNull(dept.getDeptId()), SysDept::getDeptId, dept.getDeptId())); if (exist) { return UserConstants.NOT_UNIQUE; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index 6e22f5f15..eb125f26c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -33,8 +33,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService { private final SysDictDataMapper baseMapper; @Override - public TableDataInfo selectPageDictDataList(SysDictDataBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public TableDataInfo selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictData); Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -42,12 +42,12 @@ public class SysDictDataServiceImpl implements ISysDictDataService { /** * 根据条件分页查询字典数据 * - * @param bo 字典数据信息 + * @param dictData 字典数据信息 * @return 字典数据集合信息 */ @Override - public List selectDictDataList(SysDictDataBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List selectDictDataList(SysDictDataBo dictData) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictData); return baseMapper.selectVoList(lqw); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 4d67e8d6d..952e19888 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -49,8 +49,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService private final SysDictDataMapper dictDataMapper; @Override - public TableDataInfo selectPageDictTypeList(SysDictTypeBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public TableDataInfo selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictType); Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -58,12 +58,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService /** * 根据条件分页查询字典类型 * - * @param bo 字典类型信息 + * @param dictType 字典类型信息 * @return 字典类型集合信息 */ @Override - public List selectDictTypeList(SysDictTypeBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List selectDictTypeList(SysDictTypeBo dictType) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictType); return baseMapper.selectVoList(lqw); } @@ -219,14 +219,14 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService /** * 校验字典类型称是否唯一 * - * @param bo 字典类型 + * @param dictType 字典类型 * @return 结果 */ @Override - public String checkDictTypeUnique(SysDictTypeBo bo) { + public String checkDictTypeUnique(SysDictTypeBo dictType) { boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysDictType::getDictType, bo.getDictType()) - .ne(ObjectUtil.isNotNull(bo.getDictId()), SysDictType::getDictId, bo.getDictId())); + .eq(SysDictType::getDictType, dictType.getDictType()) + .ne(ObjectUtil.isNotNull(dictType.getDictId()), SysDictType::getDictId, dictType.getDictId())); if (exist) { return UserConstants.NOT_UNIQUE; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index 17bf77642..7e13c9f3f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -288,15 +288,15 @@ public class SysMenuServiceImpl implements ISysMenuService { /** * 校验菜单名称是否唯一 * - * @param bo 菜单信息 + * @param menu 菜单信息 * @return 结果 */ @Override - public String checkMenuNameUnique(SysMenuBo bo) { + public String checkMenuNameUnique(SysMenuBo menu) { boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysMenu::getMenuName, bo.getMenuName()) - .eq(SysMenu::getParentId, bo.getParentId()) - .ne(ObjectUtil.isNotNull(bo.getMenuId()), SysMenu::getMenuId, bo.getMenuId())); + .eq(SysMenu::getMenuName, menu.getMenuName()) + .eq(SysMenu::getParentId, menu.getParentId()) + .ne(ObjectUtil.isNotNull(menu.getMenuId()), SysMenu::getMenuId, menu.getMenuId())); if (exist) { return UserConstants.NOT_UNIQUE; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java index 5df29843f..17d9f041b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java @@ -31,8 +31,8 @@ public class SysNoticeServiceImpl implements ISysNoticeService { private final SysNoticeMapper baseMapper; @Override - public TableDataInfo selectPageNoticeList(SysNoticeBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public TableDataInfo selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(notice); Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -51,12 +51,12 @@ public class SysNoticeServiceImpl implements ISysNoticeService { /** * 查询公告列表 * - * @param bo 公告信息 + * @param notice 公告信息 * @return 公告集合 */ @Override - public List selectNoticeList(SysNoticeBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List selectNoticeList(SysNoticeBo notice) { + LambdaQueryWrapper lqw = buildQueryWrapper(notice); return baseMapper.selectVoList(lqw); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java index ccd341726..543946ce2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -37,8 +37,8 @@ public class SysPostServiceImpl implements ISysPostService { private final SysUserPostMapper userPostMapper; @Override - public TableDataInfo selectPagePostList(SysPostBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public TableDataInfo selectPagePostList(SysPostBo post, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(post); Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -46,12 +46,12 @@ public class SysPostServiceImpl implements ISysPostService { /** * 查询岗位信息集合 * - * @param bo 岗位信息 + * @param post 岗位信息 * @return 岗位信息集合 */ @Override - public List selectPostList(SysPostBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List selectPostList(SysPostBo post) { + LambdaQueryWrapper lqw = buildQueryWrapper(post); return baseMapper.selectVoList(lqw); } @@ -99,14 +99,14 @@ public class SysPostServiceImpl implements ISysPostService { /** * 校验岗位名称是否唯一 * - * @param bo 岗位信息 + * @param post 岗位信息 * @return 结果 */ @Override - public String checkPostNameUnique(SysPostBo bo) { + public String checkPostNameUnique(SysPostBo post) { boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysPost::getPostName, bo.getPostName()) - .ne(ObjectUtil.isNotNull(bo.getPostId()), SysPost::getPostId, bo.getPostId())); + .eq(SysPost::getPostName, post.getPostName()) + .ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId())); if (exist) { return UserConstants.NOT_UNIQUE; } @@ -116,14 +116,14 @@ public class SysPostServiceImpl implements ISysPostService { /** * 校验岗位编码是否唯一 * - * @param bo 岗位信息 + * @param post 岗位信息 * @return 结果 */ @Override - public String checkPostCodeUnique(SysPostBo bo) { + public String checkPostCodeUnique(SysPostBo post) { boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysPost::getPostCode, bo.getPostCode()) - .ne(ObjectUtil.isNotNull(bo.getPostId()), SysPost::getPostId, bo.getPostId())); + .eq(SysPost::getPostCode, post.getPostCode()) + .ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId())); if (exist) { return UserConstants.NOT_UNIQUE; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index 264662091..e83a124d0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -47,20 +47,20 @@ public class SysRoleServiceImpl implements ISysRoleService { private final SysRoleDeptMapper roleDeptMapper; @Override - public TableDataInfo selectPageRoleList(SysRoleBo bo, PageQuery pageQuery) { - Page page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(bo)); + public TableDataInfo selectPageRoleList(SysRoleBo role, PageQuery pageQuery) { + Page page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role)); return TableDataInfo.build(page); } /** * 根据条件分页查询角色数据 * - * @param bo 角色信息 + * @param role 角色信息 * @return 角色数据集合信息 */ @Override - public List selectRoleList(SysRoleBo bo) { - return baseMapper.selectRoleList(this.buildQueryWrapper(bo)); + public List selectRoleList(SysRoleBo role) { + return baseMapper.selectRoleList(this.buildQueryWrapper(role)); } private Wrapper buildQueryWrapper(SysRoleBo bo) { @@ -151,14 +151,14 @@ public class SysRoleServiceImpl implements ISysRoleService { /** * 校验角色名称是否唯一 * - * @param bo 角色信息 + * @param role 角色信息 * @return 结果 */ @Override - public String checkRoleNameUnique(SysRoleBo bo) { + public String checkRoleNameUnique(SysRoleBo role) { boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysRole::getRoleName, bo.getRoleName()) - .ne(ObjectUtil.isNotNull(bo.getRoleId()), SysRole::getRoleId, bo.getRoleId())); + .eq(SysRole::getRoleName, role.getRoleName()) + .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId())); if (exist) { return UserConstants.NOT_UNIQUE; } @@ -168,14 +168,14 @@ public class SysRoleServiceImpl implements ISysRoleService { /** * 校验角色权限是否唯一 * - * @param bo 角色信息 + * @param role 角色信息 * @return 结果 */ @Override - public String checkRoleKeyUnique(SysRoleBo bo) { + public String checkRoleKeyUnique(SysRoleBo role) { boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysRole::getRoleKey, bo.getRoleKey()) - .ne(ObjectUtil.isNotNull(bo.getRoleId()), SysRole::getRoleId, bo.getRoleId())); + .eq(SysRole::getRoleKey, role.getRoleKey()) + .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId())); if (exist) { return UserConstants.NOT_UNIQUE; } @@ -185,11 +185,11 @@ public class SysRoleServiceImpl implements ISysRoleService { /** * 校验角色是否允许操作 * - * @param bo 角色信息 + * @param role 角色信息 */ @Override - public void checkRoleAllowed(SysRoleBo bo) { - if (ObjectUtil.isNotNull(bo.getRoleId()) && bo.isAdmin()) { + public void checkRoleAllowed(SysRoleBo role) { + if (ObjectUtil.isNotNull(role.getRoleId()) && role.isAdmin()) { throw new ServiceException("不允许操作超级管理员角色"); } }