Merge remote-tracking branch 'origin/dev_鹤壁_强信宇_pro' into dev_pro_河南鹤壁

yuan

2026-05-14 86089ed4cb7c294cda676947f5fc672c9561e4b3

 src/main/java/com/ruoyi/framework/web/controller/BaseController.java

@@ -179,9 +179,9 @@
    /**

     * 获取登录部门id

     */

    public Long getDeptId()

    public Long [] getDeptId()

    {

        return getLoginUser().getDeptId();

        return getLoginUser().getDeptIds();

    }



    /**