1.盘空

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -195,7 +195,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	public List<OrgMenuDto> getOrgUserTree(ReginParams reginParams) {
 		List<OrgUsr> comDeptList = iOrgUsrService.getListByBizOrgTypeCode(OrgPersonEnum.公司.getKey() +"," + OrgPersonEnum.部门.getKey(),reginParams.getPersonIdentity().getBizOrgCode());
 		List<KeySite> keySiteList = this.list(new LambdaQueryWrapper<KeySite>().eq(BaseEntity::getIsDelete,false));
-		comDeptList = comDeptList.stream().map(c-> c.setTotal(keySiteList.stream().filter(k->k.getBizOrgCode().contains(c.getBizOrgCode())).count())).collect(Collectors.toList());
+		comDeptList = comDeptList.stream().map(c-> c.setTotal(keySiteList.stream().filter(k->StringUtils.isNotBlank(k.getBizOrgCode()) && k.getBizOrgCode().contains(c.getBizOrgCode())).count())).collect(Collectors.toList());
 		List<OrgMenuDto> menuList = comDeptList.stream().map(o -> {
 			OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName()+" ("+o.getTotal() + ")",
 					ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.valueOf(o.getParentId()), o.getBizOrgType(), false,