old mode 100644
new mode 100755
| | |
| | | import com.alibaba.fastjson.JSONArray; |
| | | import com.alibaba.fastjson.JSONObject; |
| | | import com.java110.dto.RoomDto; |
| | | import com.java110.dto.communityLocation.CommunityLocationDto; |
| | | import com.java110.dto.community.CommunityLocationDto; |
| | | import com.java110.dto.file.FileDto; |
| | | import com.java110.dto.file.FileRelDto; |
| | | import com.java110.dto.machine.MachineAttrDto; |
| | |
| | | } else if ("3000".equals(communityLocationDto.getLocationType())) {// 3000 房屋门 |
| | | ownerDto.setRoomId(machinePo.getLocationObjId()); |
| | | owners = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto); |
| | | }else if ("6000".equals(communityLocationDto.getLocationType())) {// 3000 房屋门 |
| | | //先根据单元门ID 查询 房屋 |
| | | RoomDto roomDto = new RoomDto(); |
| | | roomDto.setFloorId(machinePo.getLocationObjId()); |
| | | roomDto.setCommunityId(machinePo.getCommunityId()); |
| | | List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto); |
| | | if (roomDtos == null || roomDtos.size() == 0) { // 楼栋下没有房屋 |
| | | return ownerDtos; |
| | | } |
| | | ownerDto.setRoomIds(getRoomIds(roomDtos)); |
| | | owners = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto); |
| | | } |
| | | if (owners == null) { |
| | | return ownerDtos; |