Merge branch 'master' into 0929-master

liusheng

2025-10-21 2d84b9771e11b64f4224c57ebc36a157fe9a15b4

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

@@ -4,6 +4,7 @@
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;
@@ -53,7 +54,7 @@

    @Autowired
    private ISysDeptService deptService;
    

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

@@ -61,6 +62,8 @@
    @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);
    }