Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

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

@@ -74,8 +74,8 @@
         cast(tfcf.flow_deployment_id as char) as flowDeploymentId,
         art.NAME_ as taskName,
         art.TASK_DEF_KEY_ as taskDefKey
-        from t_b_crm tbc
-        left join t_b_sop_info tbsi on tbc.crm_no = tbsi.crm_no
+        from t_b_sop_info tbsi
+        left join t_b_crm tbc on tbc.crm_no = tbsi.crm_no
         left join t_b_service tbs on tbs.id = tbc.service_id
         left join t_b_service_region r on r.id=tbc.region_id
         left join sys_custom sc on sc.id = tbc.custom_id
@@ -87,13 +87,13 @@
         left join ACT_RU_TASK art on art.PROC_INST_ID_ = tffa.flow_id
         left join act_ru_identitylink ari on ari.TASK_ID_ = art.ID_
         left join t_f_custom_flow tfcf on tfcf.id = tfcfe.t_f_custom_flow_id
-        LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = tbsi.id
+<!--        LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = tbsi.id-->
         LEFT JOIN sys_user u ON u.id = tbc.region_coordinator_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
         <where>
             <if test="serviceId != null and serviceId != ''">
-                and tbc.service_id = #{serviceId}
+                and tbsi.service_id = #{serviceId}
             </if>
             <if test="regionId != null and regionId != ''">
                 and r.id = #{regionId}