|
@@ -483,7 +483,7 @@
|
|
FROM
|
|
FROM
|
|
t_b_crm tbc
|
|
t_b_crm tbc
|
|
LEFT JOIN sys_custom sc ON tbc.custom_id = sc.id
|
|
LEFT JOIN sys_custom sc ON tbc.custom_id = sc.id
|
|
- LEFT JOIN sys_custom_receiver scr ON trim( scr.NAME )= trim( sc.NAME )
|
|
|
|
|
|
+ LEFT JOIN sys_custom_receiver scr ON trim( scr.NAME )= trim( sc.NAME ) AND sc.type=scr.type
|
|
WHERE
|
|
WHERE
|
|
service_id = #{serviceUnitId}
|
|
service_id = #{serviceUnitId}
|
|
ORDER BY
|
|
ORDER BY
|