支持商城小程序方式

java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml

@@ -146,7 +146,7 @@
         left join parking_area pa on ps.pa_id = pa.pa_id and pa.status_cd = '0'
         left join t_dict t3 on t.lease_type = t3.status_cd and t3.table_name = 'owner_car' and t3.table_columns = 'lease_type'
         <if test="carTypeCd != '1003'">
-        left join owner_car moc on t.car_id = moc.car_id and moc.car_type_cd != t.car_type_cd and moc.car_type_cd = '1002'
+        left join owner_car moc on t.car_id = moc.car_id and moc.car_type_cd != t.car_type_cd and moc.car_type_cd = '1002' and moc.status_cd = '0'
         </if>
         where 1=1
         <if test="statusCd !=null and statusCd != ''">

service-api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java

@@ -149,7 +149,7 @@ public class RoomBMOImpl extends ApiBaseBMO implements IRoomBMO {
         OwnerRoomRelDto ownerRoomRelDto = BeanConvertUtil.covertBean(paramInJson, OwnerRoomRelDto.class);
         List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
 
-        if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() != 1) {
+        if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() <1) {
             throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "数据存在问题，业主和房屋对应关系不是一条");
         }
 

service-community/src/main/java/com/java110/community/cmd/room/ExitRoomCmd.java

@@ -50,12 +50,12 @@ import java.util.List;
 )
 
 @Java110ExampleDoc(
-        reqBody="{\n" +
+        reqBody = "{\n" +
                 "\t\"ownerId\": 121231,\n" +
                 "\t\"roomId\": \"123123\",\n" +
                 "\t\"communityId\": \"2022121921870161\"\n" +
                 "}",
-        resBody="{\"code\":0,\"msg\":\"成功\"}"
+        resBody = "{\"code\":0,\"msg\":\"成功\"}"
 )
 @Java110Cmd(serviceCode = "room.exitRoom")
 public class ExitRoomCmd extends Cmd {
@@ -100,11 +100,11 @@ public class ExitRoomCmd extends Cmd {
         OwnerRoomRelDto ownerRoomRelDto = BeanConvertUtil.covertBean(reqJson, OwnerRoomRelDto.class);
         List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
 
-        if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() != 1) {
+        if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) {
             throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "数据存在问题，业主和房屋对应关系不是一条");
         }
 
-        if(StringUtil.isEmpty(ownerRoomRelDtos.get(0).getRelId())){
+        if (StringUtil.isEmpty(ownerRoomRelDtos.get(0).getRelId())) {
             throw new CmdException("未包含关系");
         }