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

疯狂的狮子Li

2022-02-19 1687f207606fd33172dcff321c4b43070b2c4dae

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -152,7 +152,7 @@
     */
    @Override
    public void checkDeptDataScope(Long deptId) {
        if (!SysUser.isAdmin(LoginHelper.getUserId())) {
        if (!LoginHelper.isAdmin()) {
            SysDept dept = new SysDept();
            dept.setDeptId(deptId);
            List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);