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

gongchunyi

23 小时以前 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 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)

        {