Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

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

@@ -74,7 +74,32 @@
    </select>

    <select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
        SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
        SELECT id,
               tenant_id,
               user_type,
               account,
               name,
               real_name,
               email,
               phone,
               birthday,
               role_id,
               dept_id,
               post_id
        FROM blade_user ${ew.customSqlSegment}
        <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>
    </select>

    <!--按条件查询用户信息-->
@@ -108,7 +133,7 @@
    <!--根据手机号查询对应账号和手机号的用户信息-->
    <select id="getUserListByPhoneOrAccount" resultType="org.springblade.modules.system.entity.User">
        SELECT * FROM blade_user where is_deleted = 0
        and (account = #{phoneNumber} or phone = #{phoneNumber})
        and account = #{phoneNumber}
    </select>

    <!--用户详情map-->
@@ -131,8 +156,21 @@
        left join blade_user_dept bud on bud.user_id = bu.id
        left join blade_dept bd on bud.dept_id = bd.id and bd.is_deleted = 0
        left join blade_region br on br.code = bd.region_code
        where bu.is_deleted = 0
        where bu.is_deleted = 0 and bd.dept_nature = 2
        and bu.id = #{userId}
        union all
        (
        SELECT
        bu.*,
        bd.id as cid,bd.parent_id,bd.ancestors,bd.dept_category,bd.dept_name,bd.full_name,bd.sort,bd.region_code,
        br.level as region_level
        FROM blade_user bu
        left join blade_user_dept bud on bud.user_id = bu.id
        left join blade_dept bd on bud.dept_id = bd.id and bd.is_deleted = 0
        left join v_police_region br on br.id = bd.region_code
        where bu.is_deleted = 0 and bd.dept_nature = 1
        and bu.id = #{userId}
        )
    </select>


@@ -233,43 +271,7 @@
            )

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

        SELECT
        bu.id,
        bu.tenant_id,
        bu.code,
        bu.user_type,
        bu.account,
        bu.name,
        bu.real_name,
        bu.avatar,
        bu.email,
        bu.phone,
        bu.birthday
        FROM
        blade_user bu
        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
            <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">