fix

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

@@ -220,6 +220,7 @@
         su.name supplier
         from t_b_service tbs
         LEFT JOIN  t_b_crm a ON a.service_id = tbs.id
+        left join t_b_service_region r on r.service_id=tbs.id
         LEFT JOIN t_b_product p ON p.id = a.product_id
         LEFT JOIN sys_custom sc ON sc.id = a.custom_id
         LEFT JOIN sys_user u ON u.id = a.region_coordinator_id

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

@@ -47,6 +47,7 @@
         left join t_b_device_in_out io on io.service_id=s.id
         left join sys_device d on d.device_code=io.device_no
         <where>
+            and s.status !='FINISH'
             <if test="dpr != null and !dpr.hasAdmin and !dpr.hasPmo">
                 <if test="dpr.hasBusiness">
                     AND s.service_lead_id = #{dpr.requestUserId}
@@ -67,6 +68,7 @@
         left join t_b_device_in_out io on io.service_id=s.id
         left join sys_device d on d.device_code=io.device_no
         <where>
+            and s.status !='FINISH'
             <if test="dpr != null and !dpr.hasAdmin and !dpr.hasPmo">
                 <if test="dpr.hasBusiness">
                     AND s.service_lead_id = #{dpr.requestUserId}

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

@@ -132,7 +132,7 @@
         LEFT JOIN sys_custom sc ON sc.id = a.custom_id
 
 
-        LEFT JOIN sys_user u ON u.id = c.region_coordinator_id
+        LEFT JOIN sys_user u ON u.id = a.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