Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 39a6e3cd by huangjy
Options

fix: 房态查询问题

parent 3d7966e2
Inline Side-by-side
Showing with 3 additions and 3 deletions
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatBedServiceImpl.java
...@@ -171,20 +171,20 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl ...@@ -171,20 +171,20 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl
choiceOrgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(","))); choiceOrgIdList.addAll(Lists.newArrayList(dto.getOrgId().split(",")));
} }
List<String> orgIdList = Lists.newArrayList(); List<String> orgIdList = Lists.newArrayList();
if (com.makeit.utils.old.StringUtils.isNotEmpty(dto.getType()) && com.makeit.utils.old.StringUtils.isEmpty(dto.getOrgId())) { if (com.makeit.utils.old.StringUtils.isNotEmpty(dto.getOrgType()) && com.makeit.utils.old.StringUtils.isEmpty(dto.getOrgId())) {
orgIdList = typeOrgIdList; orgIdList = typeOrgIdList;
if (CollectionUtils.isEmpty(orgIdList)) { if (CollectionUtils.isEmpty(orgIdList)) {
orgIdList.add("-1"); orgIdList.add("-1");
} }
} }
if (com.makeit.utils.old.StringUtils.isNotEmpty(dto.getOrgId()) && com.makeit.utils.old.StringUtils.isEmpty(dto.getType())) { if (com.makeit.utils.old.StringUtils.isNotEmpty(dto.getOrgId()) && com.makeit.utils.old.StringUtils.isEmpty(dto.getOrgType())) {
orgIdList = choiceOrgIdList; orgIdList = choiceOrgIdList;
if (CollectionUtils.isEmpty(orgIdList)) { if (CollectionUtils.isEmpty(orgIdList)) {
orgIdList.add("-1"); orgIdList.add("-1");
} }
} }
if (com.makeit.utils.old.StringUtils.isNotEmpty(dto.getOrgId()) && com.makeit.utils.old.StringUtils.isNotEmpty(dto.getType())) { if (com.makeit.utils.old.StringUtils.isNotEmpty(dto.getOrgId()) && com.makeit.utils.old.StringUtils.isNotEmpty(dto.getOrgType())) {
if (CollectionUtils.isNotEmpty(choiceOrgIdList) && CollectionUtils.isNotEmpty(typeOrgIdList)) { if (CollectionUtils.isNotEmpty(choiceOrgIdList) && CollectionUtils.isNotEmpty(typeOrgIdList)) {
orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList)); orgIdList = new ArrayList<>(CollectionUtils.intersection(typeOrgIdList, choiceOrgIdList));
if (CollectionUtils.isEmpty(orgIdList)) { if (CollectionUtils.isEmpty(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