Merge remote-tracking branch 'origin/master'

linwei

2024-01-24 bdc5d99198b06b9e3fd5e6794d2efea36398b60a

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/house/entity/HouseEntity.java

@@ -125,6 +125,21 @@
     */
    @ApiModelProperty(value = "图片URLS")
    private String imageUrls;

    /**
     * 经度
     */
    private String lng;

    /**
     * 纬度
     */
    private String lat;

    /**
     * 地址
     */
    private String address;
    /**
     * 网格id
     */

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

@@ -158,6 +158,9 @@
            <if test="house.neiName!=null and house.neiName!=''">
                and br.name like concat('%',#{house.neiName},'%')
            </if>
            <if test="house.address!=null and house.address!=''">
                and jh.address like concat('%',#{house.address},'%')
            </if>
            <if test="house.houseName != null  and house.houseName != ''">and jh.house_name like
                concat('%',#{house.houseName},'%')
            </if>

 src/main/java/org/springblade/modules/property/mapper/PropertyCompanyCommentMapper.xml

@@ -24,6 +24,9 @@
        <if test="propertyCompanyComment.propertyCompanyId!=null">
            and jpcc.property_company_id = #{propertyCompanyComment.propertyCompanyId}
        </if>
        <if test="propertyCompanyComment.checkStatus!=null">
            and jpcc.check_status = #{propertyCompanyComment.checkStatus}
        </if>
    </select>

    <!--自定义分页查询(递归)-->
@@ -39,6 +42,9 @@
        <if test="propertyCompanyComment.propertyCompanyId!=null">
            and jpcc.property_company_id = #{propertyCompanyComment.propertyCompanyId}
        </if>
        <if test="propertyCompanyComment.checkStatus!=null">
            and jpcc.check_status = #{propertyCompanyComment.checkStatus}
        </if>
    </select>

    <!--递归查询-->

 src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml

@@ -130,7 +130,7 @@
        sort
        FROM blade_region
        where 1=1
        and district_code = '361102000000'
        and district_code = '361102'
        <if test="region.parentCode!=null and region.parentCode!=''">
            and parent_code = #{region.parentCode}
        </if>
@@ -155,7 +155,7 @@
        code as id,
        parent_code as parentId,
        name
        FROM blade_region where district_code = '361102000000'
        FROM blade_region where district_code = '361102'
        and region_level = 4
        <if test="regionCode!=null  and regionCode!=''">
            and code = #{regionCode}
@@ -165,7 +165,7 @@
        code as id,
        parent_code as parentId,
        name
        FROM blade_region where district_code = '361102000000'
        FROM blade_region where district_code = '361102'
        and region_level = 4
        <if test="regionCode!=null  and regionCode!=''">
            and parent_code = #{regionCode}

 src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java

@@ -154,8 +154,8 @@
        String regionCode = null;
        if (null != dept) {
            regionCode = dept.getRegionCode();
            if (StringUtils.isNotBlank(regionCode) && regionCode.equals("361100000000")) {
                regionCode = "361102000000";
            if (StringUtils.isNotBlank(regionCode) && regionCode.equals("361100")) {
                regionCode = "361102";
            }
        }
        return NodeTreeUtil.getStringNodeTree(baseMapper.getTownTree(regionCode));