Merge branch 'dev_New_pro' into dev_天津_宝东pro

云

2026-05-22 0ac75dd7df65965a6087f1f4da1cdfe024685d39

 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();

    }



    /**