Commit 30be6791 by huangjy

fixbug

parent f916d94b
......@@ -148,7 +148,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
orgIdList = StreamUtil.map(platOrgList, BaseEntity::getId);
}
if (StringUtils.isNotEmpty(param.getOrgId())) {
orgIdList = Lists.newArrayList(param.getOrgId().split(","));
orgIdList.addAll(Lists.newArrayList(param.getOrgId().split(",")));
}
return new LambdaQueryWrapper<PlatAlarmRecord>().ge(Objects.nonNull(param.getCreateDateFrom()), BaseEntity::getCreateDate, param.getCreateDateFrom())
.eq(StringUtils.isNotBlank(param.getId()),BaseEntity::getId,param.getId())
......
......@@ -113,8 +113,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
List<PlatOrg> platOrgList = platOrgService.list(new QueryWrapper<PlatOrg>().lambda().eq(PlatOrg::getType, dto.getType()));
orgIdList = StreamUtil.map(platOrgList, BaseEntity::getId);
}
if (org.apache.commons.lang3.StringUtils.isNotEmpty(dto.getOrgId())) {
orgIdList = Lists.newArrayList(dto.getOrgId().split(","));
if (StringUtils.isNotEmpty(dto.getOrgId())) {
orgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(",")));
}
return new QueryWrapper<PlatElder>().lambda()
.like(StringUtils.isNotBlank(dto.getName()), PlatElder::getName, dto.getName())
......
......@@ -166,7 +166,7 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl
orgIdList = StreamUtil.map(platOrgList, BaseEntity::getId);
}
if (StringUtil.isNotEmpty(dto.getOrgId())) {
orgIdList = Lists.newArrayList(dto.getOrgId().split(","));
orgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(",")));
}
return baseMapper.selectBySpaceIdAndStatus(new Page<>(pageReqDTO.getPage(),pageReqDTO.getLimit()),dto,orgIdList);
}
......
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