diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml index 0f99efc..15c0f01 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml @@ -149,7 +149,7 @@ su.avatar, su.status,su.login_date, su.id_card, su.bank_card, su.labor_cost, - soa.id,soa.attendance_day,soa.project_id,soa.day_length,soa.hour, + soa.id,soa.attendance_day,sop.project_id,soa.day_length,soa.hour, color, sop.project_name, sop.project_num, sop.project_type, sop.address, sop.funds, sop.functionary, sop.begin_time, sop.finish_time, sop.delivery, sop.guarantee, sop.introduction, sop.project_grade, sop.project_status, diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index c202472..3132a34 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -95,11 +95,15 @@ resultMap="RoleResult" parameterType="long"> SELECT - r.role_id, - r.role_name - FROM sys_role r + sr.role_id, + sr.role_name, + sr.data_scope, + sr.role_key, + sr.role_sort, + sr.status as role_status + FROM sys_role sr INNER JOIN sys_user_role sur - ON r.role_id = sur.role_id + ON sr.role_id = sur.role_id WHERE sur.user_id = #{user_id}