|
@@ -352,14 +352,11 @@ public class RoomService {
|
|
|
careRoomGateResult = 2;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
QueryWrapper<CareRoomRegion> queryWrapper5 = new QueryWrapper<>();
|
|
|
queryWrapper5.lambda().eq(CareRoomRegion::getRoomId,devCode);
|
|
|
List<CareRoomRegion> careRoomRegionList = careRoomRegionService.list(queryWrapper5);
|
|
|
int careRoomRegionResult = 0;
|
|
|
- if(CollUtil.isNotEmpty(careRoomRegionList)){ //允许为空
|
|
|
+ if(CollUtil.isNotEmpty(careRoomRegionList)){
|
|
|
CareRoomRegion careRoomRegion = careRoomRegionList.get(0);
|
|
|
if (careRoomRegion == null|| (StringUtils.isNotEmpty(careRoomRegion.getAck()) && !"true".equals(careRoomRegion.getAck()))) {
|
|
|
careRoomRegionResult = 2;
|
|
@@ -368,7 +365,7 @@ public class RoomService {
|
|
|
} else {
|
|
|
careRoomRegionResult = 1;
|
|
|
}
|
|
|
- } else {
|
|
|
+ } else {//允许为空
|
|
|
careRoomRegionResult = 1;
|
|
|
}
|
|
|
|