Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -233,10 +233,12 @@
            )

    </select>
    <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.system.entity.User">
    <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.house.vo.HouseholdVO">

        SELECT
        bu.id,
        jh.building,
        jh.unit,
        bu.id userId,
        bu.tenant_id,
        bu.code,
        bu.user_type,
@@ -246,7 +248,9 @@
        bu.avatar,
        bu.email,
        bu.phone,
        bu.birthday
        bu.birthday,
        jhe.building,
        jhe.unit
        FROM
        blade_user bu
        LEFT JOIN jczz_household jh ON bu.id = jh.associated_user_id and jh.is_deleted=0
@@ -258,6 +262,16 @@
                #{item}
            </foreach>
            and bu.is_deleted = 0
            and jh.relationship !=18
            <if test="param2 != null and param2 !=''">
                and jhe.building like concat('%',#{param2},'%')
            </if>
            <if test="param3 != null and param3 !=''">
                and jhe.unit like concat('%',#{param3},'%')
            </if>
            <if test="param4 != null and param4 !=''">
                and jh.name like concat('%',#{param4},'%')
            </if>
        </where>
    </select>

@@ -300,7 +314,7 @@
                 - (bu.lng * 3.1415) / 180)) * 6370.996
                 ), 2) &lt;= 1
          and  bu.role_id like concat('%','1727864411451359233','%')
          and bu.is_deleted = 0  limit 1
          and bu.is_deleted = 0 and bu.status = 2 limit 1
    </select>