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

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 @@
         <if test="updateTimeTo != null and updateTimeTo != ''">
             and DATE_FORMAT(a.update_time,'%Y-%m-%d') &lt;= #{updateTimeTo}
         </if>
-        /*推送状态*/
+        /*推送状态（来自 business_partner_push_log）*/
         <if test="pushStatus != null">
-            and b.push_status = #{pushStatus}
+            and COALESCE(pl.push_status, 1) = #{pushStatus}
         </if>
-        /*推送时间*/
+        /*推送时间（来自 business_partner_push_log）*/
         <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 test="pushTimeTo != null and pushTimeTo != ''">
-            and DATE_FORMAT(b.push_time,'%Y-%m-%d') &lt;= #{pushTimeTo}
+            and pl.push_time &lt;= #{pushTimeTo}
         </if>
         /*审核时间*/
         <if test="userAuthTimeFrom!=null and userAuthTimeTo!=null ">