|
|
@@ -84,13 +84,13 @@
|
|
|
order by u.dept_id,u.user_id
|
|
|
</select>
|
|
|
<select id="selectTraineeByBo" resultType="org.dromara.backstage.domain.vo.yc.YcTraineeVo">
|
|
|
- SELECT tpua.user_id as userId,tpuA.real_name as userXm,tpuA.user_numb as userNumb,(CASE tpua.sex WHEN '1' THEN '男' WHEN '2' THEN '女' ELSE '未知' END) as sexName
|
|
|
+ SELECT tpuA.user_id as userId,tpuA.real_name as userXm,tpuA.user_numb as userNumb,(CASE tpuA.sex WHEN '1' THEN '男' WHEN '2' THEN '女' ELSE '未知' END) as sexName
|
|
|
,tpuA.phone as mobilePhone,tpuA.id_number as idNumber
|
|
|
,tpuA.category,tpuA.card_type as userCardTypeId,tpuA.lifespan as userExpiryDate,tsd.dept_id as deptId,tsd.dept_name as deptName
|
|
|
,tsd.check_Date as checkinDate,tsd.end_date as checkoutDate,(CASE a.main_dept WHEN 'Y' THEN 1 ELSE 0 END ) as isMainDept,
|
|
|
a.check_status as checkinState,a.pay_status as payStatus,tpuA.other_id as otherId
|
|
|
FROM t_pt_userAccount tpuA
|
|
|
- INNER JOIN t_user_dept a on a.user_id=tpuA.user_id
|
|
|
+ INNER JOIN t_user_dept a on a.user_id=tpuA.user_id and a.main_dept='Y'
|
|
|
INNER JOIN t_sys_dept tsd on tsd.dept_id=a.dept_id
|
|
|
<where>
|
|
|
<if test="bo.phone != null and bo.phone != ''">
|
luoyb