Merge branch 'fixbug/568-bowen-time-zone'

* fixbug/568-bowen-time-zone:
  优化逻辑

crontask/contact_form.go

@@ -149,15 +149,21 @@ func (l *CronTask) analyze() {
 		return
 	}
 
-	for _, u := range data {
-		if _, ok := contactFieldTemplates[u.BotID]; !ok {
-			c, _ := l.svcCtx.DB.ContactFieldTemplate.Query().Where(contactfieldtemplate.OrganizationID(u.OrganizationID)).First(l.ctx)
-			if c != nil {
-				contactFieldTemplates[u.BotID] = c.Template
-			} else {
-				contactFieldTemplates[u.BotID] = nil
-			}
+	wxs, err := l.svcCtx.DB.Wx.Query().All(l.ctx)
+	if err != nil {
+		return
+	}
+
+	for _, wx := range wxs {
+		c, _ := l.svcCtx.DB.ContactFieldTemplate.Query().Where(contactfieldtemplate.OrganizationID(wx.OrganizationID)).First(l.ctx)
+		if c != nil {
+			contactFieldTemplates[wx.Wxid] = c.Template
+		} else {
+			contactFieldTemplates[wx.Wxid] = nil
 		}
+	}
+
+	for _, u := range data {
 		if contactFieldTemplates[u.BotID] == nil {
 			continue
 		}