公会优化-加入公会-房间列表加上房间ID

accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/hall/HallVo.java

@@ -24,6 +24,9 @@ public class HallVo {
 
     private Long ownerErbanNo;
 
+    private Long roomId;
+    private String roomName;
+
     public Long getOwnerErbanNo() {
         return ownerErbanNo;
     }
@@ -95,4 +98,20 @@ public class HallVo {
     public void setHallName(String hallName) {
         this.hallName = hallName;
     }
+
+    public Long getRoomId() {
+        return roomId;
+    }
+
+    public void setRoomId(Long roomId) {
+        this.roomId = roomId;
+    }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
 }

accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/HallMapper.xml

@@ -233,10 +233,12 @@
     <result column="hallName" property="hallName" jdbcType="VARCHAR"/>
     <result column="ownerUid" property="ownerUid" jdbcType="BIGINT"/>
     <result column="ownerAvatar" property="ownerAvatar" jdbcType="VARCHAR"/>
+    <result column="roomId" property="roomId" jdbcType="BIGINT"/>
+    <result column="roomName" property="roomName" jdbcType="VARCHAR"/>
   </resultMap>
 
   <select id="listHall" resultMap="hallVo">
-    select ch.clan_id clanId, h.id hallId, r.title hallName, r.avatar ownerAvatar, h.owner_uid ownerUid
+    select ch.clan_id clanId, h.id hallId, r.title hallName, r.avatar ownerAvatar, h.owner_uid ownerUid, r.room_id roomId, r.title roomName
     from hall h, clan_hall ch, room r
     where h.id = ch.hall_id and h.status = 1 and ch.status = 1
       and h.owner_uid = r.uid