Merge remote-tracking branch 'origin/master'

master
lishiwei 2026-08-28 10:57:10 +08:00
commit 1cca784a2a
1 changed files with 1 additions and 1 deletions

View File

@ -35,7 +35,7 @@
ON g.mkmj_id = m.id ON g.mkmj_id = m.id
AND m.delete_enum = 'FALSE' AND m.delete_enum = 'FALSE'
LEFT JOIN `user` u LEFT JOIN `user` u
ON u.user_id_card = BINARY TO_BASE64(TRIM(r.person_code)) ON u.user_id_card = TO_BASE64(TRIM(r.person_code))
AND u.delete_enum = 'FALSE' AND u.delete_enum = 'FALSE'
WHERE r.delete_enum = 'FALSE' WHERE r.delete_enum = 'FALSE'
<if test="params.userId != null"> <if test="params.userId != null">