Browse Source

策略品台推送的用户进行二次过滤,避免并发推送

xingzai 2 years ago
parent
commit
a99a365184
2 changed files with 7 additions and 2 deletions
  1. 1 1
      models/industrial_management.go
  2. 6 1
      services/send_company_user.go

+ 1 - 1
models/industrial_management.go

@@ -527,7 +527,7 @@ func GetIndustrialManagemenDetailByAaticleID(articleId int) (items []*Industrial
 			cygx_industrial_article_group_management AS mg
 			INNER JOIN cygx_industrial_management AS m ON mg.industrial_management_id = m.industrial_management_id 
 		WHERE
-			mg.article_id = ? `
+			mg.article_id = ?  GROUP BY mg.industrial_management_id `
 	_, err = o.Raw(sql, articleId).QueryRows(&items)
 	return
 }

+ 6 - 1
services/send_company_user.go

@@ -115,6 +115,11 @@ func DotongbuShangHai(cont context.Context) (err error) {
 		}
 	}
 	condition = ` AND p.modify_time > ` + "'" + updateTime + "'"
+	companyIds = strings.TrimRight(companyIds, ",")
+	if companyIds != "" {
+		//这一部分先不推送,避免并发推送
+		condition += ` AND c.company_id  NOT  IN (` + companyIds + ") "
+	}
 
 	//偶尔需要单独同步某一个公司的人员
 	//condition = ` AND c.company_id  =  8284  `
@@ -122,7 +127,7 @@ func DotongbuShangHai(cont context.Context) (err error) {
 	go DotongbuShangHaApi(condition)
 
 	//原有的公司如果新增了也同步
-	companyIds = strings.TrimRight(companyIds, ",")
+	//companyIds = strings.TrimRight(companyIds, ",")
 	if companyIds != "" {
 		condition = ` AND c.company_id  IN (` + companyIds + ")"
 		go DotongbuShangHaApi(condition)