From 92ed53e44fb2da1f91b8fb9932af8ff433febe83 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 06 七月 2022 18:47:09 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
index b0ec5f4..a4cb04e 100755
--- a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
@@ -211,7 +211,6 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
<!-- 鏌ヨ涓氫富淇℃伅 add by wuxw 2018-07-03 -->
@@ -510,6 +509,7 @@
#{item}
</foreach>
</if>
+ order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -533,7 +533,7 @@
SELECT t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id
bId,
t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,t.owner_type_cd ownerTypeCd,
- r.`room_id` roomId,r.`room_num` roomNum,t.community_id,t.community_id communityId,t.id_card, t.id_card idCard
+ r.`room_id` roomId,r.`room_num` roomNum,t.community_id,t.community_id communityId,t.id_card, t.id_card idCard,orr.start_time startTime ,orr.end_time endTime
FROM building_room r,building_owner_room_rel orr,building_owner t
WHERE r.`room_id` = orr.`room_id`
AND orr.`owner_id` = t.`owner_id`
@@ -592,7 +592,8 @@
t.room_id roomId
FROM
business_building_owner_room_rel t
- INNER JOIN building_owner bo ON t.owner_id = bo.owner_id AND bo.status_cd = '0' AND bo.community_id = #{communityId}
+ INNER JOIN building_owner bo ON t.owner_id = bo.owner_id AND bo.status_cd = '0' AND bo.community_id =
+ #{communityId}
WHERE
t.operate = 'ADD'
AND t.room_id = #{roomId}
--
Gitblit v1.8.0