Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

modules/sociaty/api_cross_apply.go

@@ -145,6 +145,14 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (
 	if !isCheck {
 		// 触发任务条件
 		tasks = append(tasks, comm.GetBuriedParam(comm.Rtype109, 1))
+			// 发邮件
+		if err := this.module.modelSociaty.sendMail("GuildApproved", []string{sociaty.Name}, []string{uid}); err != nil {
+			this.module.Error("发送邮件 模板ID:GuildApproved",
+				log.Field{Key: "uid", Value: uid},
+				log.Field{Key: "申请人", Value: uid},
+				log.Field{Key: "sociatyId", Value: sociaty.Id},
+			)
+		}
 	}
 	rsp := &pb.SociatyApplyResp{
 		Uid:       uid,