|
@@ -1608,8 +1608,9 @@
|
|
|
${ex.selected}
|
|
|
FROM
|
|
|
worker_number_check a
|
|
|
+ JOIN `user` c on c.nick_name = a.worker_name and RIGHT(c.mobile,4) = RIGHT(a.worker_phone_yun,4)
|
|
|
+ JOIN websit_user d on a.websit_id = d.websit_id and c.user_id = d.user_id and d.examine_status = 'OK'
|
|
|
LEFT JOIN admin_websit b on a.websit_id = b.websit_id
|
|
|
- LEFT JOIN `user` c on c.nick_name = a.worker_name and RIGHT(c.mobile,4) = RIGHT(a.worker_phone_yun,4)
|
|
|
${ex.query}
|
|
|
<if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
|
|
|
AND a.websit_id IN
|
|
@@ -1617,7 +1618,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- HAVING a.worker_number_yun != c.worker_number or c.worker_number is null
|
|
|
+ HAVING a.worker_number_yun != d.worker_number
|
|
|
<if test="ex.orderBy == null or ex.orderBy ==''">
|
|
|
ORDER BY a.websit_id,a.worker_number DESC
|
|
|
</if>
|
|
@@ -1633,8 +1634,9 @@
|
|
|
c.worker_number
|
|
|
FROM
|
|
|
worker_number_check a
|
|
|
+ JOIN `user` c on c.nick_name = a.worker_name and RIGHT(c.mobile,4) = RIGHT(a.worker_phone_yun,4)
|
|
|
+ JOIN websit_user d on a.websit_id = d.websit_id and c.user_id = d.user_id and d.examine_status = 'OK'
|
|
|
LEFT JOIN admin_websit b on a.websit_id = b.websit_id
|
|
|
- LEFT JOIN `user` c on c.nick_name = a.worker_name and RIGHT(c.mobile,4) = RIGHT(a.worker_phone_yun,4)
|
|
|
${ex.query}
|
|
|
<if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
|
|
|
AND a.websit_id IN
|