新增Orgid

liusheng

2025-09-29 55f5271f893a25a7be671b24938e49976936a67b

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -4,7 +4,9 @@
import javax.servlet.http.HttpServletResponse;

import com.ruoyi.common.core.domain.entity.SysUserRole;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -53,10 +55,15 @@
    @Autowired
    private ISysDeptService deptService;

    @Value("${isAdmin}")
    private List<Long> isAdmin;

    //@PreAuthorize("@ss.hasPermi('system:role:list')")
    @GetMapping("/list")
    public TableDataInfo list(SysRole role) {
        startPage();
        SysUser user = SecurityUtils.getLoginUser().getUser();
        role.setOrgid(user.getOrgid());
        List<SysRole> list = roleService.selectRoleList(role);
        return getDataTable(list);
    }
@@ -118,7 +125,7 @@
        if (roleService.updateRole(role) > 0) {
            // 更新缓存用户权限
            LoginUser loginUser = getLoginUser();
            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) {
            if (StringUtils.isNotNull(loginUser.getUser()) && !isAdmin.contains(loginUser.getUser().getUserId())) {
                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
                tokenService.setLoginUser(loginUser);