Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

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

@@ -181,4 +181,19 @@
      return baseMapper.selDeptList();
   }

   @Override
   public List<DeptVo> selXQList() {
      return baseMapper.selXQList();
   }

   /**
    * 懒加载获取部门树形结构--关联组织机构（包含保安员信息）
    */
   @Override
   public List<DeptVO> lazyTreeSecurity(String tenantId, Long parentId) {
      if (AuthUtil.isAdministrator()) {
         tenantId = StringPool.EMPTY;
      }
      return ForestNodeMerger.merge(baseMapper.lazyTreeSecurity(tenantId, parentId));
   }
}