Merge branch 'crm/crm_fix_bug_0718' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/roadshow/calendar.go

@@ -2304,8 +2304,12 @@ func (this *CalendarController) ResearcherCalendarDetail() {
 			if v.Source == 1 && v.CompanyName == "" {
 				v.CompanyName = v.Title
 			}
-			sysUserIds = append(sysUserIds, v.SysUserId)
-			companyIds = append(companyIds, v.CompanyId)
+			if v.SysUserId > 0 {
+				sysUserIds = append(sysUserIds, v.SysUserId)
+			}
+			if v.CompanyId > 1 {
+				companyIds = append(companyIds, v.CompanyId)
+			}
 		}
 
 		//如果是权益销售建的会，客户状态替换成权益那边的

utils/constants.go

@@ -299,7 +299,7 @@ const (
 	CACHE_KEY_DAYNEW_REFRESH            = "admin:day_new:refresh"               //每日资讯拉取企业微信聊天记录
 	CACHE_KEY_DAYNEW_TRANSLATE          = "admin:day_new:translate"             //每日资讯中翻英
 	CACHE_KEY_ADMIN_OPERATE_RECORD      = "HZ_ADMIN_CACHE_ADMIN_OPERATE_RECORD" //系统用户操作日志队列
-	CACHE_KEY_SHANG_HAI_RS_CALENDAR_API = "hz_crm_shang_hai_rs_calendar_api"    //上海研究员日历同步对列
+	CACHE_KEY_SHANG_HAI_RS_CALENDAR_API = "hz_crm_shang_hai_rs_calendar_api"    //上海研究员日历同步队列
 
 	CACHE_SYNC_ADMIN      = "hz_crm_eta:sync_admin"      // 同步用户的缓存队列key
 	CACHE_SYNC_ROLE       = "hz_crm_eta:sync_role"       // 同步角色的缓存队列key