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

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

@@ -4,8 +4,8 @@
 
     <select id="getFlowTaskRemindMsgInfo" resultType="com.qmth.sop.business.bean.result.FlowTaskMsgResult">
         select
-            tbc.id as serviceId,
-            tbc.name as serviceName,
+            tbs.id as serviceId,
+            tbs.name as serviceName,
             sc.name as customName,
             su.real_name as realName,
             su.mobile_number as mobileNumber,
@@ -14,6 +14,7 @@
         from
             t_f_custom_flow_entity tfcfe
             left join t_b_crm tbc on tbc.crm_no = tfcfe.crm_no
+            left join t_b_service tbs on tbs.id = tbc.service_id
             left join sys_custom sc on sc.id = tbc.custom_id
             left join t_b_ding_apply tbda on tbda.ding_exception_no = tfcfe.code
             left join t_b_project_exchange tbpe on tbpe.exchange_no = tfcfe.code
@@ -24,29 +25,31 @@
 
     <select id="getFlowTaskRemindSmsInfo" resultType="com.qmth.sop.business.bean.result.FlowTaskSmsResult">
         select
-            tbc.id as serviceId,
-            tbc.name as serviceName,
+            tbs.id as serviceId,
+            tbs.name as serviceName,
             sc.name as customName,
             su.real_name as realName,
             su.mobile_number as mobileNumber
         from
             t_f_custom_flow_entity tfcfe
-                left join t_b_crm tbc on tbc.crm_no = tfcfe.crm_no
-                left join sys_custom sc on sc.id = tbc.custom_id
-                left join sys_user su on su.id = #{userId}
+            left join t_b_crm tbc on tbc.crm_no = tfcfe.crm_no
+            left join t_b_service tbs on tbs.id = tbc.service_id
+            left join sys_custom sc on sc.id = tbc.custom_id
+            left join sys_user su on su.id = #{userId}
         where
             tfcfe.id = #{id}
     </select>
 
     <select id="getFlowTaskRemindSmsInfoByCrmNo" resultType="com.qmth.sop.business.bean.result.FlowTaskSmsResult">
         select
-            tbc.id as serviceId,
-            tbc.name as serviceName,
+            tbs.id as serviceId,
+            tbs.name as serviceName,
             sc.name as customName,
             su.real_name as realName,
             su.mobile_number as mobileNumber
         from
             t_b_crm tbc
+            left join t_b_service tbs on tbs.id = tbc.service_id
             left join sys_custom sc on sc.id = tbc.custom_id
             left join sys_user su on su.id = #{userId}
         where