Merge branch 'dev_New_pro' into dev_pro_山西长治

gongchunyi

2026-07-05 6f266c7dbc1f843e00d4f48dfd3a61671f70e124

 src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java

@@ -155,5 +155,10 @@


    List<Long> getUserByRole(@Param("role") String role);



    /**

     * 查询所有活跃用户（含部门名称和角色名称）

     */

    List<SysUser> selectUserListWithDetail();



    List<Long> getUserByPerms(@Param("perms") List<String> perms);

}