From 7986643236f6916b2e543e540a5a5ee3f40a1de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=94=E8=80=81=E5=B3=B0?= Date: Thu, 11 Dec 2025 13:46:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E9=80=9A=E8=BF=87=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E5=8F=B7=E6=90=9C=E7=B4=A2=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=88=90?= =?UTF-8?q?=E5=91=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/user/OwnerServiceDaoImplMapper.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml index dffe86a166..6cd4924cd3 100755 --- a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml +++ b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml @@ -136,7 +136,10 @@ left join t_dict tdType on tdType.table_name = 'building_owner' and tdType.`table_columns` = 'person_type' and tdType.status_cd = t.person_type left join t_dict tdRole on tdRole.table_name = 'building_owner' and tdRole.`table_columns` = 'person_role' and tdRole.status_cd = t.person_role - left join building_owner_room_rel borr on borr.status_cd = '0' and t.member_id = borr.owner_id + + left join building_owner_room_rel borr on borr.status_cd = '0' + + and (t.owner_id = borr.owner_id or t.member_id = borr.owner_id) left join building_owner_room_rel borr on t.member_id = borr.owner_id and borr.status_cd = t.status_cd @@ -241,7 +244,10 @@ from building_owner t left join t_dict td on td.table_name = 'building_owner' and td.`table_columns` = 'owner_type_cd' and td.status_cd = t.owner_type_cd - left join building_owner_room_rel borr on borr.status_cd = '0' and t.owner_id = borr.owner_id + + left join building_owner_room_rel borr on borr.status_cd = '0' + + and (t.owner_id = borr.owner_id or t.member_id = borr.owner_id) left join building_owner_room_rel borr on t.owner_id = borr.owner_id and borr.status_cd = t.status_cd -- Gitee From cc198406e38d289a3601e27d06fcc9ebd0368ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=94=E8=80=81=E5=B3=B0?= Date: Thu, 11 Dec 2025 13:47:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=A4=9A=E6=88=BF=E9=97=B4=E5=8F=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=94=A8=E9=80=97=E5=8F=B7=E5=88=86=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/java110/user/cmd/owner/QueryOwnerAndMembersCmd.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerAndMembersCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerAndMembersCmd.java index a866ab5b63..b818828c44 100644 --- a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerAndMembersCmd.java +++ b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnerAndMembersCmd.java @@ -173,9 +173,9 @@ public class QueryOwnerAndMembersCmd extends Cmd { continue; } roomName = ""; - for (int roomIndex = 0; roomIndex < roomDtos.size(); roomIndex++) { - if (roomIndex > 2) { - break; + for (int roomIndex = 0; roomIndex < roomDtos.size() && roomIndex <3;roomIndex++) { + if (roomIndex > 0) { + roomName += ","; } RoomDto tmpRoomDto = roomDtos.get(roomIndex); roomName += (tmpRoomDto.getFloorNum() + "-" + tmpRoomDto.getUnitNum() + "-" + tmpRoomDto.getRoomNum()); -- Gitee