加入用户权限操作

sop-business/src/main/java/com/qmth/sop/business/cache/impl/CommonCacheServiceImpl.java

@@ -669,7 +669,6 @@ public class CommonCacheServiceImpl implements CommonCacheService {
     protected MenuResult userMenuCommon(Long userId) {
         MenuResult menuResult = (MenuResult) cacheService.get(SystemConstant.USER_MENU_CACHE, String.valueOf(userId));
         if (Objects.isNull(menuResult)) {
-            SysUser sysUser = this.userCache(userId);
             List<SysUserRole> sysUserRoleList = this.userRolePrivilegeCache(userId);
             List<SysRolePrivilege> sysRolePrivilegeList = new ArrayList<>();
             for (SysUserRole s : sysUserRoleList) {

sop-business/src/main/java/com/qmth/sop/business/entity/SysPrivilege.java

@@ -32,7 +32,7 @@ public class SysPrivilege implements Serializable {
     @ApiModelProperty(value = "URL地址")
     private String url;
 
-    @ApiModelProperty(value = "类型，MENU：菜单，BUTTON：按钮，LINK：链接，URL：接口地址，LIST：列表，CONDITION：查询条件，TAB：选项卡")
+    @ApiModelProperty(value = "类型，MENU：菜单，BUTTON：按钮，LINK：链接，URL：接口地址，LIST：列表，CONDITION：查询条件")
     private PrivilegeEnum type;
 
     @ApiModelProperty(value = "上级菜单")

sop-business/src/main/java/com/qmth/sop/business/service/impl/BasicVerifyCodeServiceImpl.java

@@ -51,7 +51,7 @@ public class BasicVerifyCodeServiceImpl extends ServiceImpl<BasicVerifyCodeMappe
             throw ExceptionResultEnum.ERROR.exception("短信验证码已关闭");
         }
         BasicVerifyCode basicVerifyCode = this.getOne(new QueryWrapper<BasicVerifyCode>().lambda().eq(BasicVerifyCode::getMobileNumber, mobileNumber).eq(BasicVerifyCode::getUserId, sysUser.getId()));
-        if (basicVerifyCode != null) {
+        if (Objects.nonNull(basicVerifyCode)) {
             Date oldCreateTime = new Date(basicVerifyCode.getCreateTime());
             SysConfig sysConfigSmsSendInterval = commonCacheService.addSysConfigCache(SystemConstant.CODE_SEND_INTERVAL);
             Optional.ofNullable(sysConfigSmsSendInterval).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置短信验证码发送间隔"));
@@ -86,6 +86,7 @@ public class BasicVerifyCodeServiceImpl extends ServiceImpl<BasicVerifyCodeMappe
                 throw ExceptionResultEnum.ERROR.exception(smsResponseResult.getMessage());
             }
         } catch (Exception e) {
+            log.error(SystemConstant.LOG_ERROR, e);
             throw ExceptionResultEnum.ERROR.exception("请重新获取验证码");
         }
         return true;

sop-business/src/main/java/com/qmth/sop/business/service/impl/SysPrivilegeServiceImpl.java

@@ -39,7 +39,7 @@ public class SysPrivilegeServiceImpl extends ServiceImpl<SysPrivilegeMapper, Sys
         List<SysPrivilege> sysPrivilegeList = this.list(new QueryWrapper<SysPrivilege>().lambda()
                 .ne(SysPrivilege::getType, PrivilegeEnum.URL)
                 .eq(SysPrivilege::getEnable, true)
-                .eq(SysPrivilege::getDefaultAuth, true));
+                .eq(SysPrivilege::getFrontDisplay, true));
         List<PrivilegeDto> list = (List<PrivilegeDto>) this.getMenuTreeCommon(sysPrivilegeList);
         Collections.sort(list);
         return list;

sop-business/src/main/resources/db/install/sop_db.sql

@@ -502,7 +502,7 @@ CREATE TABLE `sys_privilege` (
                                  `id` bigint NOT NULL COMMENT '主键',
                                  `name` varchar(100) NOT NULL COMMENT '菜单名称',
                                  `url` varchar(100) NOT NULL COMMENT 'URL地址',
-                                 `type` varchar(50) NOT NULL COMMENT '类型，MENU：菜单，BUTTON：按钮，LINK：链接，URL：接口地址，LIST：列表，CONDITION：查询条件，TAB：选项卡',
+                                 `type` varchar(50) NOT NULL COMMENT '类型，MENU：菜单，BUTTON：按钮，LINK：链接，URL：接口地址，LIST：列表，CONDITION：查询条件',
                                  `parent_id` bigint DEFAULT NULL COMMENT '上级菜单',
                                  `sequence` int NOT NULL COMMENT '序号',
                                  `property` varchar(30) DEFAULT NULL COMMENT '属性，NO_AUTH：无需鉴权，AUTH：鉴权，SYS：系统公用',
@@ -762,6 +762,8 @@ INSERT INTO `sys_privilege` VALUES (242, '查询条件', 'Condition', 'CONDITION
 INSERT INTO `sys_privilege` VALUES (243, '查询', 'Select', 'BUTTON', 240, 2, 'AUTH', '72', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (244, '导出日志', 'Export', 'LINK', 240, 1, 'AUTH', NULL, 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (245, '下载文件', 'Download', 'LINK', 240, 2, 'AUTH', NULL, 1, 0, 1);
+INSERT INTO `sys_privilege` VALUES (246, '获取菜单权限', '/api/admin/sys/privilege/list', 'URL', 64, 7, 'SYS', NULL, 1, 1, 0);
+INSERT INTO `sys_privilege` VALUES (247, '获取用户权限', '/api/admin/common/get_menu', 'URL', 64, 8, 'SYS', NULL, 1, 1, 0);
 COMMIT;
 
 -- ----------------------------