|
|
@@ -108,9 +108,10 @@
|
|
|
SELECT a.id, a.role_id as roleId, a.role_name as roleName, a.name, a.phone, a.portrait_url AS portraitUrl, a.role, a.company_id AS companyId, a.cost,
|
|
|
a.department_id AS departmentId, b.department_name AS departmentName, a.department_cascade AS departmentCascade,a.corpwx_userid as corpwxUserid,
|
|
|
a.month_cost as monthCost, a.salary_type as salaryType, a.is_active as isActive,date_format(a.`inactive_date`, '%Y-%m-%d') AS inactiveDate, a.cost_apply_date as costApplyDate,a.plate1,a.plate2,a.plate3,a.plate4,a.plate5,
|
|
|
- a.job_number as jobNumber, DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%m') as createTime, c.name as superiorName, c.corpwx_userid as superiorCorpwxUserid
|
|
|
+ a.job_number as jobNumber, DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%m') as createTime, c.name as superiorName, c.corpwx_userid as superiorCorpwxUserid,ug.group_name as groupName
|
|
|
FROM user AS a
|
|
|
LEFT JOIN department AS b ON a.department_id = b.department_id
|
|
|
+ left join user_group as ug on ug.id=a.user_group_id
|
|
|
left join user c on c.id = a.superior_id and c.company_id = #{companyId}
|
|
|
WHERE a.company_id = #{companyId} AND a.department_id IN
|
|
|
<foreach collection="departmentIds" item="departmentId" index="index" open="(" close=")" separator=",">
|
Min