Merge branch 'master' into dev

zxl

2025-03-02 42a7552b9c8603aeab7f0785eb05270dfbeb0bd3

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

@@ -34,6 +34,7 @@
        <result property="ancestors" column="ancestors"   />
        <result property="orderNum"  column="order_num"   />
        <result property="leader"    column="leader"      />
        <result property="phone"    column="phone"      />
        <result property="status"    column="dept_status" />
    </resultMap>

@@ -48,7 +49,7 @@

   <sql id="selectUserVo">
        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, 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
          left join sys_dept d on u.dept_id = d.dept_id
@@ -227,6 +228,6 @@
    </delete>

   <select id="getByDept" resultMap="SysUserResult">
      select * from sys_user where dept_id = #{deptId}
      select * from sys_user where dept_id = #{deptId} and del_flag = '0'
   </select>
</mapper>