Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -266,7 +266,7 @@
                        <otherwise>
                            and
                            (
                            jg.grid_code in ('') or jpag.community_code in in ('')
                            jg.grid_code in ('') or jpag.community_code in ('')
                            )
                        </otherwise>
                    </choose>
@@ -344,6 +344,7 @@
        jp.is_front,
        jp.front_type,
        jp.remark,
        jp.three_fire_protection,
        bu.real_name as username,bu.phone as phone,
        jppl.id as plid,
        jppl.place_id,
@@ -643,7 +644,7 @@
                        <otherwise>
                            and
                            (
                            jg.grid_code in ('') or jpag.community_code in in ('')
                            jg.grid_code in ('') or jpag.community_code in ('')
                            )
                        </otherwise>
                    </choose>
@@ -685,39 +686,44 @@
        <result property="remark"    column="remark"    />
        <result property="isDeleted"    column="is_deleted"    />
        <result property="aoiCode"    column="aoi_code"    />
        <result property="threeFireProtection"    column="three_fire_protection"    />
    </resultMap>

    <sql id="selectPlace">
       select
           id,
           house_code,
           building_code,
           principal_user_id,
           principal,
           principal_id_card,
           principal_phone,
           place_name,
           lng,
           lat,
           location,
           image_urls,
           grid_code,
           source,
           status,
           is_scene,
           is_nine,
           nine_type,
           is_front,
           front_type,
           create_user,
           create_time,
           update_user,
           update_time,
           remark,
           is_deleted,

      from
           jczz_place
        select
            id,
            house_code,
            house_code_binds,
            building_code,
            principal_user_id,
            principal,
            principal_phone,
            principal_id_card,
            place_name,
            lng,
            lat,
            location,
            image_urls,
            grid_id,
            grid_code,
            jw_grid_code,
            source,
            status,
            is_scene,
            is_nine,
            nine_type,
            is_front,
            front_type,
            create_user,
            create_time,
            update_user,
            update_time,
            remark,
            is_deleted,
            aoi_code,
            three_fire_protection
        from
            jczz_place
    </sql>