浏览代码

查询当前用户角色key方法修改

侯茂昌 1 年之前
父节点
当前提交
b90a96f1c4

+ 5 - 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -47,11 +47,11 @@ public class CaptchaController
     {
         AjaxResult ajax = AjaxResult.success();
         boolean captchaEnabled = configService.selectCaptchaEnabled();
-        //ajax.put("captchaEnabled", captchaEnabled);
-        //if (!captchaEnabled)
-        //{
-        //    return ajax;
-        //}
+        ajax.put("captchaEnabled", captchaEnabled);
+        if (!captchaEnabled)
+        {
+            return ajax;
+        }
 
         // 保存验证码信息
         String uuid = IdUtils.simpleUUID();

+ 0 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -5,7 +5,6 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.annotation.Anonymous;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 6 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -78,6 +78,12 @@ public class SysRoleServiceImpl implements ISysRoleService {
         return roles;
     }
 
+    /**
+     * 根据用户ID查询角色列表key
+     *
+     * @param userId 用户ID
+     * @return 角色列表
+     */
     @Override
     public String[] selectRolesKeyByUserId(Long userId) {
         String[] strings = roleMapper.selectUserRoleKeyByUserId(userId);