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

修改商业合作伙伴推送-各组织独立问题

Browse Source
This commit is contained in:
zhaoqing
2026-06-11 12:27:54 +08:00
parent df558e0103
commit e6fcccc6f1
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
+11 -10
View File
@@ -162,13 +162,14 @@
b.tax_number, b.tax_number,
b.user_email, b.user_email,
b.user_remark as userRemarkShipper, b.user_remark as userRemarkShipper,
b.push_status, b.data_source,
b.push_time, COALESCE(pl.push_status, 1) AS push_status,
b.push_by, pl.push_time,
b.push_by_name, pl.push_by,
b.data_source pl.push_by_name
FROM "USER" a FROM "USER" a
LEFT JOIN user_shipper b ON a.user_id = b.user_id LEFT JOIN user_shipper b ON a.user_id = b.user_id
LEFT JOIN business_partner_push_log pl ON pl.shipper_id = b.shipper_id AND pl.organization_id = #{organizationId}
left join (select user_id, LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName left join (select user_id, LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName
from role r from role r
left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1 left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1
@@ -324,16 +325,16 @@
<if test="updateTimeTo != null and updateTimeTo != ''"> <if test="updateTimeTo != null and updateTimeTo != ''">
and DATE_FORMAT(a.update_time,'%Y-%m-%d') &lt;= #{updateTimeTo} and DATE_FORMAT(a.update_time,'%Y-%m-%d') &lt;= #{updateTimeTo}
</if> </if>
/*推送状态*/ /*推送状态（来自 business_partner_push_log）*/
<if test="pushStatus != null"> <if test="pushStatus != null">
and b.push_status = #{pushStatus} and COALESCE(pl.push_status, 1) = #{pushStatus}
</if> </if>
/*推送时间*/ /*推送时间（来自 business_partner_push_log）*/
<if test="pushTimeFrom != null and pushTimeFrom != ''"> <if test="pushTimeFrom != null and pushTimeFrom != ''">
and DATE_FORMAT(b.push_time,'%Y-%m-%d') &gt;= #{pushTimeFrom} and pl.push_time &gt;= #{pushTimeFrom}
</if> </if>
<if test="pushTimeTo != null and pushTimeTo != ''"> <if test="pushTimeTo != null and pushTimeTo != ''">
and DATE_FORMAT(b.push_time,'%Y-%m-%d') &lt;= #{pushTimeTo} and pl.push_time &lt;= #{pushTimeTo}
</if> </if>
/*审核时间*/ /*审核时间*/
<if test="userAuthTimeFrom!=null and userAuthTimeTo!=null "> <if test="userAuthTimeFrom!=null and userAuthTimeTo!=null ">