提交 5d1abc18 作者: 刘明祎-运维用途

Merge branch 'develop'

...@@ -170,6 +170,7 @@ ...@@ -170,6 +170,7 @@
LEFT JOIN real_name_auth rna ON pc.user_account_id = rna.user_account_id LEFT JOIN real_name_auth rna ON pc.user_account_id = rna.user_account_id
LEFT JOIN user_account ua ON pc.user_account_id = ua.id LEFT JOIN user_account ua ON pc.user_account_id = ua.id
LEFT JOIN pilot_reason pr ON pc.reason_id = pr.id LEFT JOIN pilot_reason pr ON pc.reason_id = pr.id
left join pilot_join_team pjt on pjt.pilot_user_id = ua.id
WHERE WHERE
1 = 1 1 = 1
AND ua.`disable` = 0 AND ua.`disable` = 0
...@@ -191,6 +192,9 @@ ...@@ -191,6 +192,9 @@
or rna.user_name like concat('%',#{accountNumber},'%') or rna.user_name like concat('%',#{accountNumber},'%')
or ua.phone_num like concat('%',#{accountNumber},'%')) or ua.phone_num like concat('%',#{accountNumber},'%'))
</if> </if>
<if test="backUserId != null">
and pjt.back_user_id = #{backUserId} and pjt.pilot_status = 1
</if>
order by pc.update_time desc, pc.create_time desc order by pc.update_time desc, pc.create_time desc
</select> </select>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论