邮件发送模板完成

skyeye-email/src/main/resources/mapper/email/EmailSendModelMapper.xml

@@ -6,24 +6,18 @@
 		SELECT
 			esm.id,
 			esm.title,
-			esm.to_people toPeople,
-			esm.to_cc toCc,
-			esm.to_bcc toBcc,
 			b.user_name createName,
 			CONVERT(esm.create_time, char) createTime,
 			c.user_name lastUpdateName,
 			CONVERT(esm.last_update_time, char) lastUpdateTime
 		FROM
 		    email_send_model esm
-		LEFT JOIN sys_eve_user_staff b ON esm.create_id = b.user_id
-		LEFT JOIN sys_eve_user_staff c ON esm.last_update_id = c.user_id
+			LEFT JOIN sys_eve_user_staff b ON esm.create_id = b.user_id
+			LEFT JOIN sys_eve_user_staff c ON esm.last_update_id = c.user_id
 		WHERE 1 = 1
 		<if test="title != null and title != ''">
 			AND esm.title = '%${title}%'
 		</if>
-		<if test="toPeople != null and toPeople != ''">
-			AND esm.to_people = #{toPeople}
-		</if>
 		ORDER BY esm.create_time DESC
 	</select>
 
@@ -39,8 +33,8 @@
 		    esm.id,
 		    esm.title,
 		    esm.to_people toPeople,
-		    esm.to_cc toCc,
-		    esm.to_bcc toBcc,
+		    IFNULL(esm.to_cc, '') toCc,
+			IFNULL(esm.to_bcc, '') toBcc,
 			b.user_name createName,
 			CONVERT(esm.create_time, char) createTime,
 			c.user_name lastUpdateName,
@@ -58,12 +52,8 @@
 		SET
 			title = #{title},
 			to_people = #{toPeople},
-			<if test="toCc != null and toCc != ''">
-				to_cc = #{toCc},
-			</if>
-			<if test="toBcc != null and toBcc != ''">
-				to_bcc = #{toBcc},
-			</if>
+			to_cc = #{toCc},
+			to_bcc = #{toBcc},
 			last_update_id = #{userId},
 			last_update_time = #{lastUpdateTime}
 		WHERE id = #{id}

skyeye-email/src/main/resources/reqmapping/mapping/email.xml

@@ -118,13 +118,12 @@
 	<!-- 邮件发送模板开始 -->
     <url id="emailsendmodel001" path="/post/EmailSendModel/queryEmailSendModelList" val="分页获取邮箱发送模板列表" method="POST" allUse="2" groupName="邮件发送模板管理">
         <property id="title" name="title" ref="" var="标题"/>
-        <property id="toPeople" name="toPeople" ref="" var="收件人"/>
         <property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
         <property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
     </url>
     <url id="emailsendmodel002" path="/post/EmailSendModel/insertEmailSendModel" val="新增邮件发送模板" method="POST" allUse="1" groupName="邮件发送模板管理">
         <property id="title" name="title" ref="required" var="标题" />
-        <property id="toPeople" name="toPeople" ref="required,email" var="收件人" />
+        <property id="toPeople" name="toPeople" ref="required" var="收件人" />
         <property id="toCc" name="toCc" ref="" var="抄送人" />
         <property id="toBcc" name="toBcc" ref="" var="暗送" />
     </url>
@@ -137,7 +136,7 @@
     <url id="emailsendmodel005" path="/post/EmailSendModel/updateEmailSendModelById" val="根据邮件模板id更新模板内容" method="PUT" allUse="1" groupName="邮件发送模板管理">
         <property id="id" name="id" ref="required" var="邮件id" />
         <property id="title" name="title" ref="required" var="标题" />
-        <property id="toPeople" name="toPeople" ref="required,email" var="收件人" />
+        <property id="toPeople" name="toPeople" ref="required" var="收件人" />
         <property id="toCc" name="toCc" ref="" var="抄送人" />
         <property id="toBcc" name="toBcc" ref="" var="暗送" />
     </url>