Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml

@@ -71,7 +71,7 @@
                        <otherwise>
                            and
                            (
                            jg.grid_code in ('') or jpag.community_code in in ('')
                            jg.grid_code in ('') or jpag.community_code in ('')
                            )
                        </otherwise>
                    </choose>
@@ -114,8 +114,9 @@
        LEFT JOIN jczz_doorplate_address jda ON jp.house_code = jda.address_code
        <where>
            <if test="placeExt.neiCode != null and placeExt.neiCode != ''">
                and jda.nei_code = #{placeExt.neiCode}
               and jpag.community_code like concat('%',#{placeExt.neiCode},'%')
            </if>

            <if test="placeExt.confirmFlag != null">
                and jpe.confirm_flag = #{placeExt.confirmFlag}
            </if>
@@ -169,7 +170,7 @@
                            <otherwise>
                                and
                                (
                                jg.grid_code in ('') or jpag.community_code in in ('')
                                jg.grid_code in ('') or jpag.community_code in ('')
                                )
                            </otherwise>
                        </choose>
@@ -210,17 +211,17 @@
        <result property="updateUser"    column="update_user"    />
        <result property="updateTime"    column="update_time"    />
        <result property="isDeleted"    column="is_deleted"    />
        <result property="legalTempAddress"    column="legal_temp_address"    />
        <result property="legalAge"    column="legal_age"    />
        <result property="legalGender"    column="legal_gender"    />
        <result property="legalIdCard"    column="legal_id_card"    />
        <result property="legalCardType"    column="legal_card_type"    />
        <result property="legalRegisteredAddress"    column="legal_registered_address"    />
        <result property="legalJobNature"    column="legal_job_nature"    />
        <result property="legalWxAccount"    column="legal_wx_account"    />
        <result property="birthday"    column="birthday"    />
        <result property="ethnicity"    column="ethnicity"    />
        <result property="employer"    column="employer"    />
<!--        <result property="legalTempAddress"    column="legal_temp_address"    />-->
<!--        <result property="legalAge"    column="legal_age"    />-->
<!--        <result property="legalGender"    column="legal_gender"    />-->
<!--        <result property="legalIdCard"    column="legal_id_card"    />-->
<!--        <result property="legalCardType"    column="legal_card_type"    />-->
<!--        <result property="legalRegisteredAddress"    column="legal_registered_address"    />-->
<!--        <result property="legalJobNature"    column="legal_job_nature"    />-->
<!--        <result property="legalWxAccount"    column="legal_wx_account"    />-->
<!--        <result property="birthday"    column="birthday"    />-->
<!--        <result property="ethnicity"    column="ethnicity"    />-->
<!--        <result property="employer"    column="employer"    />-->
    </resultMap>

    <sql id="selectJczzPlaceExt">
@@ -239,15 +240,7 @@
            create_time,
            update_user,
            update_time,
            is_deleted,
            legal_temp_address,
            legal_age,
            legal_gender,
            legal_id_card,
            legal_card_type,
            legal_registered_address,
            legal_job_nature,
            legal_wx_account
            is_deleted
        from
            jczz_place_ext
    </sql>