fix: bug

sop-business/src/main/resources/mapper/ServiceAnalyseMapper.xml

@@ -182,19 +182,24 @@
         r.region_name
         FROM
         t_b_crm c
-        left join t_b_service_region r on r.id=c.region_id
-<!--        LEFT JOIN sys_user u ON u.id = c.region_coordinator_id-->
-<!--        LEFT JOIN t_b_user_archives ua ON u.mobile_number = ua.mobile_number-->
-<!--        LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id-->
-<!--        LEFT JOIN sys_supplier su ON su.id = us.supplier_id-->
+        LEFT JOIN
+        t_b_service_region r ON r.id = c.region_id
+        LEFT JOIN
+        t_b_user_archives_allocation tbuaa on tbuaa.crm_no = c.crm_no
+        LEFT JOIN
+        t_b_user_archives ua ON ua.id = tbuaa.archives_id
+        LEFT JOIN
+        t_b_user_archives_supplier us ON us.user_archives_id = ua.id
+        LEFT JOIN
+        sys_supplier su ON su.id = us.supplier_id
         <where>
             and r.id IS NOT NULL
             <if test="serviceUnitId != null and serviceUnitId != ''">
                 and c.service_id = #{serviceUnitId}
             </if>
-<!--            <if test="supplierId != null and supplierId != ''">-->
-<!--                and us.supplier_id = #{supplierId}-->
-<!--            </if>-->
+            <if test="supplierId != null and supplierId != ''">
+                and us.supplier_id = #{supplierId}
+            </if>
         </where>
     </select>
 

sop-business/src/main/resources/mapper/SopAnalyseMapper.xml

@@ -46,7 +46,7 @@
         LEFT join t_f_custom_flow_entity tfcfe on tfcfe.code = s.sop_no
         LEFT join t_f_flow_approve tffa on tffa.flow_id = tfcfe.flow_id
         LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = s.id
-        LEFT JOIN sys_user u ON u.id = c.region_coordinator_id
+        LEFT JOIN sys_user u ON u.id = c.lead_id
         LEFT JOIN t_b_user_archives ua ON ua.mobile_number = u.mobile_number
         LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id
         LEFT JOIN sys_supplier su ON su.id = us.supplier_id