diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml index 311b1a141..cbde44994 100644 --- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml @@ -162,13 +162,14 @@ b.tax_number, b.user_email, b.user_remark as userRemarkShipper, - b.push_status, - b.push_time, - b.push_by, - b.push_by_name, - b.data_source + b.data_source, + COALESCE(pl.push_status, 1) AS push_status, + pl.push_time, + pl.push_by, + pl.push_by_name FROM "USER" a 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 from role r left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1 @@ -324,16 +325,16 @@ and DATE_FORMAT(a.update_time,'%Y-%m-%d') <= #{updateTimeTo} - /*推送状态*/ + /*推送状态(来自 business_partner_push_log)*/ - and b.push_status = #{pushStatus} + and COALESCE(pl.push_status, 1) = #{pushStatus} - /*推送时间*/ + /*推送时间(来自 business_partner_push_log)*/ - and DATE_FORMAT(b.push_time,'%Y-%m-%d') >= #{pushTimeFrom} + and pl.push_time >= #{pushTimeFrom} - and DATE_FORMAT(b.push_time,'%Y-%m-%d') <= #{pushTimeTo} + and pl.push_time <= #{pushTimeTo} /*审核时间*/