Merge branch 'master' of https://github.com/java110/MicroCommunity

java110

2020-08-23 08d8b029b10706b135713424e9b2a1b6e3839372

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

@@ -125,6 +125,9 @@
        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,t.create_time createTime,t.community_id,
        t.community_id communityId,t.id_card, t.id_card idCard,t.state,td.name ownerTypeName
        <if test="roomIds != null">
            , borr.room_id roomId
        </if>
        from building_owner t,t_dict td
        <if test="roomId != null and roomId != ''">
            ,building_owner_room_rel borr
@@ -502,7 +505,7 @@
        where o.status_cd = '0'
        and o.owner_type_cd = '1001'
        and o.community_id = #{communityId}
        and orr.rel_id is null or orr.state in ('2001','2003')
        and orr.rel_id is null
    </select>

    <!-- queryOwnersByRoom -->
@@ -527,6 +530,7 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        and t.owner_type_cd = '1001'
        AND r.`status_cd` = '0'
        AND orr.`status_cd` = '0'
        AND t.`status_cd` = '0'