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

java110

2020-05-18 3f4948a093237990407b4deaa77506c720dbb859

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

@@ -382,15 +382,12 @@

    </select>


    <!-- 查询业主数量 add by wuxw 2018-07-03 -->
    <select id="queryOwnersCountByCondition" parameterType="Map" resultType="Map">
        select count(1) count
        FROM building_owner t , s_community_member cm
        WHERE t.`member_id` = cm.`member_id`
        AND cm.`community_id` = #{communityId}
        AND cm.`status_cd` = '0'
        AND t.`status_cd` = '0'
        FROM building_owner t
        WHERE
        t.`status_cd` = '0'
        <if test="sex !=null ">
            and t.sex= #{sex}
        </if>
@@ -442,11 +439,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.community_id,
        t.community_id communityId,t.id_card, t.id_card idCard
        FROM building_owner t , s_community_member cm
        WHERE t.`member_id` = cm.`member_id`
        AND cm.`community_id` = #{communityId}
        AND cm.`status_cd` = '0'
        AND t.`status_cd` = '0'
        FROM building_owner t
        WHERE
        t.`status_cd` = '0'
        <if test="sex !=null ">
            and t.sex= #{sex}
        </if>