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-05 10:47:46 +08:00
parent 5005f4291f
commit 32f12bb138
49 changed files with 254 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-user-center/src/main/resources/mapper/UserMapper.xml
+16 -16
View File
@@ -76,7 +76,7 @@
a.ding_user_id,
a.ding_dept_id,
a.validity_period_management
FROM `user` a
FROM "USER" a
where a.del_flag = 1
</sql>
@@ -99,9 +99,9 @@
u.user_idcard_number as userIdcardNumber,
u.top_organization_id AS topOrganizationId
FROM
`user_shipper` s
user_shipper s
LEFT JOIN
`user` u
user u
ON u.user_id = s.user_id
<where>
<if test="topOrganizationId != null "> and u.top_organization_id = #{topOrganizationId}</if>
@@ -120,9 +120,9 @@
u.user_idcard_number as userIdcardNumber,
u.top_organization_id AS topOrganizationId
FROM
`user_shipper` s
user_shipper s
LEFT JOIN
`user` u
user u
ON u.user_id = s.user_id and u.del_flag = 1
<where>
s.del_flag = 1 and s.shipper_fill = 3
@@ -416,7 +416,7 @@
a.user_account,
a.avatar
FROM
`user` a
user a
WHERE
a.del_flag = 1
<include refid="common_where1"></include>
@@ -451,7 +451,7 @@
u.user_birthday,
ude.driver_captain_fill
from user_driver_enterprise ude
left join user u on ude.user_id = u.user_id and u.del_flag = 1
left join "USER" u on ude.user_id = u.user_id and u.del_flag = 1
where ude.del_flag = 1
and ude.driver_type = 2
and u.user_id = #{userId}
@@ -538,7 +538,7 @@
when datediff(dvb.vehicle_checkout_period_validity, NOW()) &lt; 0 then 2
else 0
end) as drivingPermitExpStatus
from user u
from "USER" u
left join user_driver ud on u.user_id = ud.user_id and ud.del_flag = 1
left join user_driver_enterprise ude on u.user_id = ude.user_id and ude.del_flag = 1 and ude.driver_type = 1
left join driver_vehicle_bind dvb
@@ -663,7 +663,7 @@
us.shipper_enterprise_name,
us.shipper_type
FROM
`user` u
user u
LEFT JOIN user_shipper us ON u.user_id = us.user_id
WHERE
u.del_flag = 1
@@ -681,7 +681,7 @@
ude.driver_enterprise_name,
ude.driver_type
FROM
`user` u
user u
LEFT JOIN user_driver_enterprise ude ON u.user_id = ude.user_id
WHERE
u.del_flag = 1
@@ -705,7 +705,7 @@
a.user_account,
a.avatar
FROM
`user` a
user a
WHERE
a.del_flag = 1
and a.top_organization_id = #{topOrganizationId}
@@ -714,9 +714,9 @@
<select id="findAllShipperInfo" resultType="com.mhd.user.interfaces.vo.QueryAllShipperInfoVo">
SELECT u.user_id, u.user_name, u.user_area_address, u.user_area_county_id, u.user_area_name ,u.user_phone,u.has_default_address,b.shipper_id,b.shipper_enterprise_name
FROM `user` u
LEFT JOIN `user_shipper` b ON u.user_id = b.user_id
left join (select user_id, GROUP_CONCAT(r.role_name separator '&amp;') roleName
FROM "USER" u
LEFT JOIN user_shipper b ON u.user_id = b.user_id
left join (select user_id, WM_CONCAT(r.role_name separator '&amp;') roleName
from role r
left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1
where r.del_flag = 1
@@ -738,9 +738,9 @@
SELECT
user_shipper.shipper_enterprise_name
FROM
`user` u
user u
INNER JOIN
`user_shipper` ON u.user_id = user_shipper.user_id
user_shipper ON u.user_id = user_shipper.user_id
WHERE
u.del_flag = 1
AND user_shipper.del_flag = 1