|
@@ -518,10 +518,10 @@
|
|
|
SELECT
|
|
|
DISTINCT su.id_ userId,su.username_ userName, su.avatar_ avatar, su.phone_ phone
|
|
|
FROM
|
|
|
- practice_group pg
|
|
|
- LEFT JOIN sys_user su ON pg.student_id_ = su.id_
|
|
|
+ sys_user su
|
|
|
+ LEFT JOIN practice_group pg ON pg.student_id_ = su.id_
|
|
|
WHERE
|
|
|
- pg.type_ IN ('FREE', 'TRIAL')
|
|
|
+ 1=1
|
|
|
<if test="organIdList!=null">
|
|
|
AND su.organ_id_ IN
|
|
|
<foreach collection="organIdList" item="organId" open="(" close=")" separator=",">
|
|
@@ -543,10 +543,10 @@
|
|
|
SELECT
|
|
|
COUNT(DISTINCT su.id_)
|
|
|
FROM
|
|
|
- practice_group pg
|
|
|
- LEFT JOIN sys_user su ON pg.student_id_ = su.id_
|
|
|
+ sys_user su
|
|
|
+ LEFT JOIN practice_group pg ON pg.student_id_ = su.id_
|
|
|
WHERE
|
|
|
- pg.type_ IN ('FREE', 'TRIAL')
|
|
|
+ 1=1
|
|
|
<if test="organIdList!=null">
|
|
|
AND su.organ_id_ IN
|
|
|
<foreach collection="organIdList" item="organId" open="(" close=")" separator=",">
|