lbqms.git - Gitblit

			@@ -13,9 +13,10 @@
			import com.ruoyi.common.mybatis.core.page.TableDataInfo;
			import com.ruoyi.common.satoken.utils.LoginHelper;
			import com.ruoyi.system.domain.SysDept;
			import com.ruoyi.system.domain.SysRole;
			import com.ruoyi.system.domain.SysUser;
			import com.ruoyi.system.domain.SysUserRole;
			import com.ruoyi.system.domain.bo.SysRoleBo;
			import com.ruoyi.system.domain.vo.SysRoleVo;
			import com.ruoyi.system.service.ISysDeptService;
			import com.ruoyi.system.service.ISysRoleService;
			import com.ruoyi.system.service.ISysUserService;
			@@ -49,7 +50,7 @@
			*/
			@SaCheckPermission("system:role:list")
			@GetMapping("/list")
			public TableDataInfo<SysRole> list(SysRole role, PageQuery pageQuery) {
			public TableDataInfo<SysRoleVo> list(SysRoleBo role, PageQuery pageQuery) {
			return roleService.selectPageRoleList(role, pageQuery);
			}

			@@ -59,9 +60,9 @@
			@Log(title = "角色管理", businessType = BusinessType.EXPORT)
			@SaCheckPermission("system:role:export")
			@PostMapping("/export")
			public void export(SysRole role, HttpServletResponse response) {
			List<SysRole> list = roleService.selectRoleList(role);
			ExcelUtil.exportExcel(list, "角色数据", SysRole.class, response);
			public void export(SysRoleBo role, HttpServletResponse response) {
			List<SysRoleVo> list = roleService.selectRoleList(role);
			ExcelUtil.exportExcel(list, "角色数据", SysRoleVo.class, response);
			}

			/**
			@@ -71,7 +72,7 @@
			*/
			@SaCheckPermission("system:role:query")
			@GetMapping(value = "/{roleId}")
			public R<SysRole> getInfo(@PathVariable Long roleId) {
			public R<SysRoleVo> getInfo(@PathVariable Long roleId) {
			roleService.checkRoleDataScope(roleId);
			return R.ok(roleService.selectRoleById(roleId));
			}
			@@ -82,7 +83,7 @@
			@SaCheckPermission("system:role:add")
			@Log(title = "角色管理", businessType = BusinessType.INSERT)
			@PostMapping
			public R<Void> add(@Validated @RequestBody SysRole role) {
			public R<Void> 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))) {
			@@ -98,7 +99,7 @@
			@SaCheckPermission("system:role:edit")
			@Log(title = "角色管理", businessType = BusinessType.UPDATE)
			@PutMapping
			public R<Void> edit(@Validated @RequestBody SysRole role) {
			public R<Void> edit(@Validated @RequestBody SysRoleBo role) {
			roleService.checkRoleAllowed(role);
			roleService.checkRoleDataScope(role.getRoleId());
			if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
			@@ -126,7 +127,7 @@
			@SaCheckPermission("system:role:edit")
			@Log(title = "角色管理", businessType = BusinessType.UPDATE)
			@PutMapping("/dataScope")
			public R<Void> dataScope(@RequestBody SysRole role) {
			public R<Void> dataScope(@RequestBody SysRoleBo role) {
			roleService.checkRoleAllowed(role);
			roleService.checkRoleDataScope(role.getRoleId());
			return toAjax(roleService.authDataScope(role));
			@@ -138,7 +139,7 @@
			@SaCheckPermission("system:role:edit")
			@Log(title = "角色管理", businessType = BusinessType.UPDATE)
			@PutMapping("/changeStatus")
			public R<Void> changeStatus(@RequestBody SysRole role) {
			public R<Void> changeStatus(@RequestBody SysRoleBo role) {
			roleService.checkRoleAllowed(role);
			roleService.checkRoleDataScope(role.getRoleId());
			return toAjax(roleService.updateRoleStatus(role));
			@@ -161,7 +162,7 @@
			*/
			@SaCheckPermission("system:role:query")
			@GetMapping("/optionselect")
			public R<List<SysRole>> optionselect() {
			public R<List<SysRoleVo>> optionselect() {
			return R.ok(roleService.selectRoleAll());
			}