|
|
@@ -21,6 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="projectName" column="project_name" />
|
|
|
<result property="sourceFrom" column="source_from" />
|
|
|
<result property="roleName" column="role_name" />
|
|
|
+ <result property="deptId" column="dept_id" />
|
|
|
+ <result property="deptName" column="dept_name" />
|
|
|
<!-- <collection property="approvers" ofType="java.lang.String" javaType="list" >-->
|
|
|
<!-- <result column="approvers" />-->
|
|
|
<!-- </collection>-->
|
|
|
@@ -46,12 +48,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
su.user_type,
|
|
|
sp.project_name,
|
|
|
sp.source_from,
|
|
|
- sr.role_name
|
|
|
+ sr.role_name,
|
|
|
+ su.dept_id,
|
|
|
+ sd.dept_name
|
|
|
from sys_project_staff as sps
|
|
|
left join sys_user as su on sps.user_id = su.user_id
|
|
|
left join sys_project as sp on sps.project_pid = sp.project_pid
|
|
|
left join sys_user_role ur on ur.user_id = su.user_id
|
|
|
left join sys_role as sr on ur.role_id = sr.role_id
|
|
|
+ left join sys_dept as sd on sd.dept_id = su.dept_id
|
|
|
<where>
|
|
|
<if test="projectPid != null and projectPid != ''"> and sps.project_pid = #{projectPid}</if>
|
|
|
<if test="userId != null and userId != ''"> and sps.user_id = #{userId}</if>
|