Merge remote-tracking branch 'origin/master'

linwe

2023-12-23 9b8cf1c18a25f2322791a7d2fd268b42f2e01fa1

 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml

@@ -142,7 +142,12 @@
        <if test="household.confirmFlag != null ">
            and jh.confirm_flag = #{household.confirmFlag}
        </if>

        <if test="household.townStreetName!=null and household.townStreetName!=''">
            and jda.town_street_name like concat('%',#{household.townStreetName},'%')
        </if>
        <if test="household.neiName!=null and household.neiName!=''">
            and jda.nei_name like concat('%',#{household.neiName},'%')
        </if>
        <if test="household.housingRentalId != null ">
            and jh.housing_rental_id = #{household.housingRentalId}
        </if>
@@ -277,7 +282,7 @@
        ( SELECT
        IF
        (
        id_card IS NULL,
        id_card IS NULL or id_card = '',
        '未知',
        IF
        (SUBSTRING( id_card, 17, 1 ) % 2 = 1, '男', '女' )) AS gender
@@ -287,7 +292,7 @@
        WHERE
        jda.nei_code = #{code}
        AND jh.is_deleted = 0
        <if test="userId != null">
        <if test="userId != null and roleType == '1'">
            AND jda.address_code IN (
            SELECT
            jgr.house_code
@@ -299,6 +304,16 @@
            jgm.user_id = #{userId}
            AND jh.house_code = jgr.house_code
            AND jg.is_deleted = 0
            )
        </if>
        <if test="userId != null and roleType == '3'">
            AND jda.address_code IN (SELECT
            jda.address_code
            FROM
            jczz_doorplate_address jda
            LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
            WHERE
            jc.res_police_user_id = #{userId})
            )
        </if>
        ) a
@@ -323,18 +338,29 @@
        WHERE
            jda.nei_code =  #{code}
          AND jh.is_deleted = 0
        <if test="userId != null">
        AND jda.address_code IN (
        SELECT
        distinct jgr.house_code
        FROM
        jczz_grid jg
        LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
        LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
        WHERE
        jgm.user_id = #{userId}
        AND jg.is_deleted = 0
        )
        <if test="userId != null and roleType == '1'">
            AND jda.address_code IN (
            SELECT
            distinct jgr.house_code
            FROM
            jczz_grid jg
            LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
            LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
            WHERE
            jgm.user_id = #{userId}
            AND jg.is_deleted = 0
            )
        </if>

        <if test="userId != null and roleType == '3'">
            AND jda.address_code IN (SELECT
            jda.address_code
            FROM
            jczz_doorplate_address jda
            LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
            WHERE
            jc.res_police_user_id = #{userId})
            )
        </if>
        GROUP BY age
    </select>