Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

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

@@ -191,11 +191,8 @@
    * 懒加载获取部门树形结构,不包含顶级管理员公安局
    */
   @Override
   public List<DeptVO> securityLazyTree(String tenantId, Long parentId) {
      if (AuthUtil.isAdministrator()) {
         tenantId = StringPool.EMPTY;
      }
      return ForestNodeMerger.merge(baseMapper.securityLazyTree(tenantId, parentId));
   public List<DeptVO> securityLazyTree(String jurisdiction, Long parentId) {
      return ForestNodeMerger.merge(baseMapper.securityLazyTree(jurisdiction, parentId));
   }

   @Override