fix:修复 sysuser

wlzboy

2025-11-10 1bc97562ccf38d0b6235f2efdba35eb68f1f208b

fix:修复 sysuser

 ruoyi-admin/src/main/resources/application.yml

@@ -58,7 +58,7 @@
    basename: i18n/messages
  profiles:
    # 环境 dev|test|prod
    active: dev
    active: prod
  # 文件上传
  servlet:
    multipart:

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -254,7 +254,7 @@
    <select id="selectUsersByBranchDeptIds" resultMap="SysUserResult">
        SELECT DISTINCT
            u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, 
            u.avatar, u.phonenumber, u.sex, u.status, u.del_flag,
            u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.create_time,
            d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
            r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
        FROM sys_user u
@@ -263,19 +263,16 @@
        LEFT JOIN sys_role r ON r.role_id = ur.role_id
        WHERE u.del_flag = '0'
            AND u.status = '0'
            AND u.dept_id IN (
                -- 查询分公司及其所有子部门
            AND u.dept_id IN (				
                SELECT t.dept_id 
                FROM sys_dept t
                WHERE t.del_flag = '0' 
                    AND (
                        -- 分公司本身
                    AND (						
                        t.dept_id IN
                        <foreach collection="branchDeptIds" item="deptId" open="(" separator="," close=")">
                            #{deptId}
                        </foreach>
                        OR
                        -- 分公司的子部门（通过ancestors字段匹配）
                        OR						
                        <foreach collection="branchDeptIds" item="deptId" open="(" separator=" OR " close=")">
                            find_in_set(#{deptId}, t.ancestors) > 0
                        </foreach>