Merge remote-tracking branch 'origin/master'

linwe

2023-12-19 7b6ad0f09bfc5cd45a1aacfdfe55e69a02b9ff26

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

@@ -29,7 +29,7 @@
        ) b on a.id = b.id
        ) jppl on jppl.place_id = jp.id
        where jp.is_deleted = 0
        <if test="place.roleName!=null and place.roleName!=''">
        <if test="place.roleName!=null and place.roleName!='' and place.createUser!=null">
            <choose>
                <when test="place.roleName=='网格员'">
                    and
@@ -57,6 +57,12 @@
        <if test="place.principalPhone!=null and place.principalPhone!=''">
            and jp.principal_phone like concat('%',#{place.principalPhone},'%')
        </if>
        <if test="place.houseCode!=null and place.houseCode!=''">
            and jp.house_code = #{place.houseCode}
        </if>
        <if test="place.id!=null">
            and jp.id = #{place.id}
        </if>
        <if test="place.isPerfect==1">
            and
            (