weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

达梦适配修改

Browse Source
This commit is contained in:
王奎兴
2025-12-06 20:34:00 +08:00
parent ee9935b5c3
commit 5b2212d5db
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml
+5 -5
View File
@@ -189,7 +189,7 @@
WM_CONCAT(DISTINCT dvb.vehicle_license_plate_number ) AS vehicleLicensePlateNumber, WM_CONCAT(DISTINCT dvb.vehicle_license_plate_number ) AS vehicleLicensePlateNumber,
WM_CONCAT(DISTINCT m.motorcade_name ) AS driverTeamName WM_CONCAT(DISTINCT m.motorcade_name ) AS driverTeamName
FROM FROM
user b "user" b
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
user_id, user_id,
@@ -325,7 +325,7 @@
FROM FROM
user_driver a user_driver a
LEFT JOIN LEFT JOIN
user u "user" u
ON u.user_id = a.user_id AND u.del_flag = 1 ON u.user_id = a.user_id AND u.del_flag = 1
WHERE WHERE
a.del_flag = 1 a.del_flag = 1
@@ -769,7 +769,7 @@
FROM FROM
user_driver d user_driver d
LEFT JOIN LEFT JOIN
user u "user" u
ON d.user_id = u.user_id ON d.user_id = u.user_id
LEFT JOIN LEFT JOIN
driver_vehicle_bind b driver_vehicle_bind b
@@ -1105,7 +1105,7 @@
ude.driver_enterprise_fill, ude.driver_enterprise_fill,
ud.driver_captain_fill ud.driver_captain_fill
FROM FROM
user b "user" b
LEFT JOIN user_driver a ON a.user_id = b.user_id LEFT JOIN user_driver a ON a.user_id = b.user_id
LEFT JOIN user_driver_enterprise ude ON b.user_id = ude.user_id LEFT JOIN user_driver_enterprise ude ON b.user_id = ude.user_id
AND ude.driver_type = 1 AND ude.driver_type = 1
@@ -1137,7 +1137,7 @@
a.user_id, a.user_id,
a.create_by a.create_by
FROM FROM
user u "user" u
LEFT JOIN user_driver a ON u.user_id = a.user_id LEFT JOIN user_driver a ON u.user_id = a.user_id
LEFT JOIN motorcade_driver md ON a.user_id = md.user_id LEFT JOIN motorcade_driver md ON a.user_id = md.user_id
LEFT JOIN motorcade m ON m.motorcade_id = md.motorcade_id LEFT JOIN motorcade m ON m.motorcade_id = md.motorcade_id
mhd-user-center/src/main/resources/mapper/UserMapper.xml
-5
View File
@@ -8,21 +8,16 @@
SELECT a.user_id, SELECT a.user_id,
a.top_organization_id, a.top_organization_id,
a.organization_id, a.organization_id,
a.organization_name,
a.role_id, a.role_id,
a.role_name, a.role_name,
a.user_phone, a.user_phone,
a.role_code,
a.user_phone,
a.user_name, a.user_name,
a.user_account, a.user_account,
a.last_login_time,
COALESCE(CONCAT( a.user_name, ' ', a.user_phone, ' ', a.user_account) COALESCE(CONCAT( a.user_name, ' ', a.user_phone, ' ', a.user_account)
,a.user_name, ' ', a.user_phone, ' ', a.user_account) AS userShowName, ,a.user_name, ' ', a.user_phone, ' ', a.user_account) AS userShowName,
a.user_member_code, a.user_member_code,
a.user_password, a.user_password,
a.user_salt, a.user_salt,
a.role_name,
a.organization_name, a.organization_name,
a.user_pay_password, a.user_pay_password,
a.user_idcard_number, a.user_idcard_number,