fengji

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -794,7 +794,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         receivers.put(user.getId(), "yanite1234@sina.com");
         receivers.put(2, "yanite2016@sina.com");
         receivers.put(3, "yanite@qq.com");
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_ACTIVATION_SUCCESSFUL, receivers, null, 0, null, "SYSTEM", null);
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_ACTIVATION_SUCCESSFUL, receivers, null, 0, null, "SYSTEM", "小风乐团", "xiaofeng", "this is password");
 
         return false;
     }

mec-biz/src/main/resources/config/mybatis/TenantEntryActivitiesMapper.xml

@@ -39,7 +39,7 @@
 
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="TenantEntryActivities">
-		SELECT * FROM tenant_entry_activities WHERE id_ = #{id}
+		SELECT * FROM tenant_entry_activities WHERE id_ = #{id} AND tenant_id_ = #{tenantId}
 	</select>
 
 	<!-- 全查询 -->

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/CommEmailPlugin.java

@@ -98,7 +98,7 @@ public class CommEmailPlugin implements MessageSenderPlugin, InitializingBean {
 		try {
 			email.setFrom(from, fromName);
 			email.setSubject(subject);
-			email.setContent(content, "text/html");
+			email.setContent(content, "text/html;charset=utf8");
 			email.addTo(receiver);
 			email.send();
 			return true;