Merge remote-tracking branch 'origin/master'

zengh

2021-07-29 8ca64d03d58db959d95f49119be0cb322d6edf2f

 src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java

@@ -211,4 +211,17 @@
      }
      return ForestNodeMerger.merge(baseMapper.lazyTreeUser(tenantId, parentId));
   }

   @Override
   public Long add(Dept dept) {
      return baseMapper.add(dept);
   }

   /**
    * 懒加载获取部门树形结构(按分类查询)
    */
   @Override
   public List<DeptVO> lazyTreeType(String deptCategory, Long parentId) {
      return ForestNodeMerger.merge(baseMapper.lazyTreeType("000000",deptCategory,parentId));
   }
}