Merge branch 'jtwy' into dev_New

zss

10 天以前 e02d6b65fae6f05e37f42c66242f05391c4a6d1a

 src/main/java/com/ruoyi/common/utils/SecurityUtils.java

@@ -38,11 +38,11 @@
    /**

     * 获取部门ID

     **/

    public static Long getDeptId()

    public static Long [] getDeptId()

    {

        try

        {

            return getLoginUser().getDeptId();

            return getLoginUser().getDeptIds();

        }

        catch (Exception e)

        {