update

src/main/java/com/qkdata/biz/sys/controller/SysMenuController.java

 package com.qkdata.biz.sys.controller;
 
+import com.qkdata.biz.common.BizConstants;
 import com.qkdata.biz.sys.entity.SysMenuPO;
 import com.qkdata.biz.sys.service.ShiroService;
 import com.qkdata.biz.sys.service.SysMenuService;
@@ -10,7 +11,9 @@ import com.qkdata.common.base.model.Result;
 import com.qkdata.common.util.UserContext;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -36,7 +39,7 @@ public class SysMenuController {
     }
     @ApiOperation("获取全部菜单列表")
     @GetMapping("/list")
-    @RequiresPermissions("sys:menu:list")
+    @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
     public Result<List<SysMenuPO>> list(){
         List<SysMenuPO> menuList = sysMenuService.list();
         for (SysMenuPO menuPO : menuList){
@@ -50,7 +53,7 @@ public class SysMenuController {
 
     @ApiOperation("获取不包含按扭的全部菜单")
     @GetMapping("/select")
-    @RequiresPermissions("sys:menu:select")
+    @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
     public Result<List<SysMenuPO>> select(){
         List<SysMenuPO> menuList = sysMenuService.queryNotButtonList();
 
@@ -67,7 +70,7 @@ public class SysMenuController {
 
     @ApiOperation("获取单个菜单详细信息")
     @GetMapping("/info/{id}")
-    @RequiresPermissions("sys:menu:info")
+    @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
     public Result<SysMenuPO> info(@PathVariable Long id){
         SysMenuPO sysMenuPO = sysMenuService.getById(id);
         return Result.succeed(sysMenuPO);
@@ -76,7 +79,7 @@ public class SysMenuController {
     @ApiOperation("保存菜单信息")
     @SysLog("保存菜单信息")
     @PostMapping("/save")
-    @RequiresPermissions("sys:menu:save")
+    @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
     public Result<String> save(@RequestBody SysMenuPO sysMenuPO){
         sysMenuService.save(sysMenuPO);
         return Result.succeed("ok");
@@ -84,7 +87,7 @@ public class SysMenuController {
     @ApiOperation("修改菜单信息")
     @SysLog("修改菜单信息")
     @PostMapping("/update")
-    @RequiresPermissions("sys:menu:update")
+    @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
     public Result<String> update(@RequestBody SysMenuPO sysMenuPO){
         sysMenuService.updateById(sysMenuPO);
         return Result.succeed("ok");
@@ -92,7 +95,7 @@ public class SysMenuController {
     @ApiOperation("删除菜单")
     @SysLog("删除菜单")
     @GetMapping("/delete/{id}")
-    @RequiresPermissions("sys:menu:delete")
+    @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
     public Result<String> delete(@PathVariable Long id){
         if (id <= 31){
             throw new BusinessException("系统菜单不能删除");

src/main/java/com/qkdata/biz/sys/controller/SysRoleController.java

@@ -32,8 +32,8 @@ public class SysRoleController {
     @ApiOperation("获取全部角色列表")
     @GetMapping("/select")
     @RequiresRoles(value = {BizConstants.ROLE_ADMIN})
-    public List<SysRolePO> select(){
-        return sysRoleService.list();
+    public Result<List<SysRolePO>> select(){
+        return Result.succeed(sysRoleService.list());
     }
 
     @ApiOperation("查询角色列表")

src/main/java/com/qkdata/biz/sys/entity/SysMenuPO.java

@@ -30,5 +30,5 @@ public class SysMenuPO extends BasePO {
     @TableField(exist = false)
     private Boolean open;
     @TableField(exist = false)
-    private List<?> list;
+    private List<?> children;
 }

src/main/java/com/qkdata/biz/sys/service/SysMenuService.java

@@ -46,7 +46,7 @@ public class SysMenuService extends BaseServiceImpl<SysMenuMapper, SysMenuPO> {
         for(SysMenuPO entity : menuList){
             //目录
             if(entity.getType() == MenuTypeEnum.FOLDER){
-                entity.setList(getMenuTreeList(queryListParentId(entity.getId(), menuIdList), menuIdList));
+                entity.setChildren(getMenuTreeList(queryListParentId(entity.getId(), menuIdList), menuIdList));
             }
             subMenuList.add(entity);
         }

src/main/java/com/qkdata/biz/sys/service/SysUserService.java

 package com.qkdata.biz.sys.service;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
@@ -69,8 +70,13 @@ public class SysUserService extends BaseServiceImpl<SysUserMapper, SysUserPO> {
         po.setLastLoginTime(LocalDateTime.now());
         po.setStatus(AccountStatusEnum.ENABLE);
         save(po);
-        //默认为运营人员
-        List<Long> roleIds = Lists.newArrayList(2L);
+        List<Long> roleIds = null;
+        if (CollUtil.isNotEmpty(sysUserModel.getRoleIdList())){
+            roleIds = sysUserModel.getRoleIdList();
+        }else {
+            //默认为运营人员
+            roleIds = Lists.newArrayList(2L);
+        }
         sysUserRoleService.saveOrUpdateUserRole(po.getId(),roleIds);
     }
 

src/main/resources/db/migration/V1.0.0__init.sql

@@ -306,7 +306,7 @@ CREATE TABLE `sys_menu` (
   `create_time` datetime DEFAULT NULL,
   `update_time` datetime DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=108 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='菜单管理';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='菜单管理';
 
 
 -- ----------------------------