Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

5 天以前 780d2ae86cc0c4ebd42922f649bf557f1f17cd62

 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)

        {