Commit 369a250f by lzy

长者入住,床位

parent 41d7fe28
......@@ -108,4 +108,12 @@ public interface PlatOrgService extends IService<PlatOrg> {
PlatOrgSplitDTO getOrgSplitVO(String orgId);
PageVO<PlatOrg> childPage(PageReqDTO<PlatOrgQueryDTO> pageReqDTO);
/**
* 排除租户账号
*
* @param param
* @return
*/
List<PlatOrg> belongToScopeListIgnoreTenant(PlatOrg param);
}
......@@ -697,4 +697,18 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
return PageUtil.toPageVO(pageList.getRecords(), pageList);
}
@Override
public List<PlatOrg> belongToScopeListIgnoreTenant(PlatOrg param) {
PlatUserVO userVO = PlatUserUtil.getUserVOCanNull();
//平台账号
Set<String> orgIdList = getOrgIdListByUserId(userVO.getId());
List<PlatOrg> orgList = this.list(new LambdaQueryWrapper<PlatOrg>()
.eq(StringUtils.isNotEmpty(param.getType()), PlatOrg::getType, param.getType())
.in(BaseEntity::getId, orgIdList).eq(PlatOrg::getStatus, CommonEnum.YES.getValue()));
if (CollectionUtils.isEmpty(orgList)) {
return new ArrayList<>();
}
return orgList;
}
}
......@@ -676,7 +676,7 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
@Override
public List<PlatSpaceVO> listBedTree(PlatSpaceQueryDTO dto, boolean flag) {
List<PlatOrg> platOrgs = platOrgService.belongToScopeList(new PlatOrg());
List<PlatOrg> platOrgs = platOrgService.belongToScopeListIgnoreTenant(new PlatOrg());
if(platOrgs.isEmpty()){
return new ArrayList<>();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment