Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -84,6 +84,10 @@
        <if test="user.roleId!=null and user.roleId!=''">
            and role_id like concat('%',#{user.roleId},'%')
        </if>

        <if test="user.deptId!=null and user.deptId!=''">
            and dept_id like concat('%',#{user.deptId},'%')
        </if>
    </select>

    <select id="searchUserByDistrictId" resultType="org.springblade.modules.system.entity.User">
@@ -229,11 +233,12 @@
            )

    </select>
    <select id="getUserInfoByDistrictIds" resultType="org.flowable.idm.engine.impl.persistence.entity.UserEntity"
            parameterType="java.util.List">
    <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,
@@ -243,20 +248,74 @@
        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
        LEFT JOIN jczz_household jh ON bu.id = jh.associated_user_id and jh.is_deleted=0
        LEFT JOIN jczz_house jhe ON jhe.house_code = jh.house_code
        LEFT JOIN jczz_district jd on jd.aoi_code=jhe.district_code
        <where>
            and jd.id = in
            and jd.id  in
            <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
                #{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>


    <select id="selectUserByDept" resultMap="userResultMap">
        select * from blade_user where is_deleted = 0
        and id != 1123598821738675201
        <if test="deptIdList!=null and deptIdList.size>0">
            and id in (
            SELECT
            user_id
            FROM
            blade_user_dept
            WHERE
            dept_id IN
            <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
            )
        </if>
        ORDER BY create_time desc
    </select>


    <select id="getPoliceUser" resultType="org.springblade.modules.system.entity.User">
        SELECT
            bu.id,
            bu.name,
            bu.phone
        FROM
            blade_user bu
        where 1 = 1
          and  bu.lat is not null
          and  bu.lng is not null
          and IFNULL((
                 ACOS(
                 SIN(
                 (#{latitude} * 3.1415) / 180) * SIN((bu.lat * 3.1415) / 180) +
                 COS((#{latitude} * 3.1415) / 180) * COS((bu.lat * 3.1415) / 180) * COS((#{longitude} * 3.1415) / 180
                 - (bu.lng * 3.1415) / 180)) * 6370.996
                 ), 2) &lt;= 1
          and  bu.role_id like concat('%','1727864411451359233','%')
          and bu.is_deleted = 0 and bu.status = 2 limit 1
    </select>


</mapper>