|
@@ -55,13 +55,20 @@ public class EgDeviceServiceImpl extends AbstractCrudService<EgDeviceMapper, EgD
|
|
|
@Override
|
|
|
public CommonPage<EgDevice> page(EgDeviceRequestVO requestVO){
|
|
|
IPage<EgDevice> page = new Page<>(requestVO.getCurrent(),requestVO.getSize());
|
|
|
+ Integer tenantId ;
|
|
|
+
|
|
|
+ if(StringUtils.isNotBlank(requestVO.getDomain())){
|
|
|
+ tenantId = egDeviceMapper.sysTenantId(requestVO.getDomain());
|
|
|
+ }else{
|
|
|
+ tenantId = SecurityUtils.getTenantId();
|
|
|
+ }
|
|
|
|
|
|
LambdaQueryWrapper<EgDevice> queryWrapper = Wrappers.lambdaQuery();
|
|
|
queryWrapper.like(StringUtils.isNotBlank(requestVO.getDeviceName()),EgDevice::getDeviceName,requestVO.getDeviceName())
|
|
|
.like(StringUtils.isNotBlank(requestVO.getInstallAddress()),EgDevice::getInstallAddress,requestVO.getInstallAddress())
|
|
|
.eq(null != requestVO.getServiceStatus(),EgDevice::getServiceStatus,requestVO.getServiceStatus())
|
|
|
.eq(null != requestVO.getId(),EgDevice::getId,requestVO.getId())
|
|
|
- .eq(EgDevice::getTenantId,SecurityUtils.getTenantId())
|
|
|
+ .eq(EgDevice::getTenantId,tenantId)
|
|
|
.orderByDesc(EgDevice::getId);
|
|
|
page = this.page(page,queryWrapper);
|
|
|
if(page.getRecords().size() > 0){
|