|
@@ -48,11 +48,11 @@
|
|
and t2.status = 1
|
|
and t2.status = 1
|
|
</select>
|
|
</select>
|
|
<select id="searchTemplateSettingList" resultMap="BaseResultMap">
|
|
<select id="searchTemplateSettingList" resultMap="BaseResultMap">
|
|
- select mapping.id,mapping.template_id,mapping.title,mapping.email,mapping.company_name,mapping.description,mapping.status
|
|
|
|
|
|
+ select mapping.id,mapping.template_id,mapping.title,mapping.email,mapping.company_name,mapping.description,mapping.status,
|
|
t.name as template_name
|
|
t.name as template_name
|
|
from PPW_EMAIL.email_template_mapping mapping
|
|
from PPW_EMAIL.email_template_mapping mapping
|
|
join PPW_EMAIL.email_template_info t on t.id = mapping.template_id and t.isvalid = 1 and t.status = 1
|
|
join PPW_EMAIL.email_template_info t on t.id = mapping.template_id and t.isvalid = 1 and t.status = 1
|
|
- where mapping,isvalid=1
|
|
|
|
|
|
+ where mapping.isvalid=1
|
|
<if test="title != null and title != ''">
|
|
<if test="title != null and title != ''">
|
|
mapping.title like concat('%',#{title},'%')
|
|
mapping.title like concat('%',#{title},'%')
|
|
</if>
|
|
</if>
|