Merge remote-tracking branch 'origin/main' into main

main
SondonYong 2025-12-09 10:50:20 +08:00
commit c494013360
1 changed files with 21 additions and 21 deletions

View File

@ -52,20 +52,20 @@
u.political_affiliation_name, u.political_affiliation_name,
u.employment_flag, u.employment_flag,
CASE CASE
WHEN LENGTH(u.user_id_card) > 0 WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0
AND MOD(SUBSTRING(u.user_id_card, 17, 1), 2) = 1 THEN AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 1 THEN
'男' '男'
WHEN LENGTH(u.user_id_card) > 0 WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0
AND MOD(SUBSTRING(u.user_id_card, 17, 1), 2) = 0 THEN AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 0 THEN
'女' '女'
END AS sex, END AS sex,
CASE CASE
WHEN LENGTH(u.user_id_card) > 0 THEN WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0 THEN
(YEAR(NOW()) - SUBSTRING(u.user_id_card, 7, 4)) ELSE NULL (YEAR(NOW()) - SUBSTRING(FROM_BASE64(u.user_id_card), 7, 4)) ELSE NULL
END AS age, END AS age,
cast(substring(u.user_id_card, 7, 8) AS DATE) AS birthday cast(substring(FROM_BASE64(u.user_id_card), 7, 8) AS DATE) AS birthday
from user u from user u
left join corp_info c on c.id = u.corpinfo_id left join corp_info c on c.id = u.corpinfo_id
left join department d on d.id = u.department_id left join department d on d.id = u.department_id
@ -142,20 +142,20 @@
u.political_affiliation_name, u.political_affiliation_name,
u.employment_flag, u.employment_flag,
CASE CASE
WHEN LENGTH(u.user_id_card) > 0 WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0
AND MOD(SUBSTRING(u.user_id_card, 17, 1), 2) = 1 THEN AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 1 THEN
'男' '男'
WHEN LENGTH(u.user_id_card) > 0 WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0
AND MOD(SUBSTRING(u.user_id_card, 17, 1), 2) = 0 THEN AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 0 THEN
'女' '女'
END AS sex, END AS sex,
CASE CASE
WHEN LENGTH(u.user_id_card) > 0 THEN WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0 THEN
(YEAR(NOW()) - SUBSTRING(u.user_id_card, 7, 4)) ELSE NULL (YEAR(NOW()) - SUBSTRING(FROM_BASE64(u.user_id_card) 7, 4)) ELSE NULL
END AS age, END AS age,
cast(substring(u.user_id_card, 7, 8) AS DATE) AS birthday cast(substring(FROM_BASE64(u.user_id_card), 7, 8) AS DATE) AS birthday
from user u from user u
left join corp_info c on c.id = u.corpinfo_id left join corp_info c on c.id = u.corpinfo_id
left join department d on d.id = u.department_id left join department d on d.id = u.department_id
@ -213,20 +213,20 @@
u.employment_flag, u.employment_flag,
u.flow_flag, u.flow_flag,
CASE CASE
WHEN LENGTH(u.user_id_card) > 0 WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0
AND MOD(SUBSTRING(u.user_id_card, 17, 1), 2) = 1 THEN AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 1 THEN
'男' '男'
WHEN LENGTH(u.user_id_card) > 0 WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0
AND MOD(SUBSTRING(u.user_id_card, 17, 1), 2) = 0 THEN AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 0 THEN
'女' '女'
END AS sex, END AS sex,
CASE CASE
WHEN LENGTH(u.user_id_card) > 0 THEN WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0 THEN
(YEAR(NOW()) - SUBSTRING(u.user_id_card, 7, 4)) ELSE NULL (YEAR(NOW()) - SUBSTRING(FROM_BASE64(u.user_id_card), 7, 4)) ELSE NULL
END AS age, END AS age,
cast(substring(u.user_id_card, 7, 8) AS DATE) AS birthday cast(substring(FROM_BASE64(u.user_id_card), 7, 8) AS DATE) AS birthday
from user u from user u
left join corp_info c on c.id = u.corpinfo_id left join corp_info c on c.id = u.corpinfo_id
left join department d on d.id = u.department_id left join department d on d.id = u.department_id