Merge branch 'cygx_need_898' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/report_mapping_category_group.go

@@ -62,3 +62,24 @@ func GetCygxReportMappingCategoryGroupList(condition string, pars []interface{})
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+// AddCygxReportMappingCategoryGroupMulti 批量添加
+func AddCygxReportMappingCategoryGroupMultiInit(items []*CygxReportMappingCategoryGroup) (err error) {
+	o, err := orm.NewOrm().Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err == nil {
+			o.Commit()
+		} else {
+			o.Rollback()
+		}
+	}()
+	//批量插入新的关联数据
+	if len(items) > 0 {
+		//批量添加流水信息
+		_, err = o.InsertMulti(len(items), items)
+	}
+	return
+}

services/article.go

@@ -808,6 +808,13 @@ func HandleArticleListByApi(artcleId int) (err error) {
 	var listAuthor []*models.CygxArticleAuthor
 	//如果是英文报告 ,或者香港类型那么则不同步  publish_area   ：all  全部  ;hk 香港
 	if articleResult.TypeId == 9 || articleResult.PublishArea != "all" {
+		// 如果是英文报告，或者是香港报告就进行删除处理
+		err = models.UpdateArticlePublish(artcleId, 0)
+		if err != nil {
+			fmt.Println("UpdateArticlePublish Err:", err.Error())
+			return err
+		}
+		UpdateArticleResourceData(artcleId) //把数据写入 cygx_resource_data 表
 		return
 	}
 
@@ -882,9 +889,9 @@ func HandleArticleListByApi(artcleId int) (err error) {
 			fmt.Println("UpdateArticlePublish Err:", err.Error())
 			return err
 		}
-		go UpdateArticleResourceData(artcleId) //把数据写入 cygx_resource_data 表
+		UpdateArticleResourceData(artcleId) //把数据写入 cygx_resource_data 表
 		//go UpdateResourceData(artcleId, "article", "delete", time.Now().Format(utils.FormatDateTime))
-		return err
+		return
 	}
 
 	//同步作者

services/report_mapping_category_group.go

@@ -145,3 +145,34 @@ func CheckArticlePermissionType(articleId int, user *models.WxUserItem) (checkPe
 	}
 	return
 }
+
+//func init() {
+//	var condition string
+//	var pars []interface{}
+//	condition += ` AND  id_cygx IN  (23) `
+//
+//	list, e := models.GetCygxReportMappingCategoryGroupList(condition, pars)
+//	if e != nil {
+//		fmt.Println(e)
+//		return
+//	}
+//	var items []*models.CygxReportMappingCategoryGroup
+//
+//	for _, v := range list {
+//		item := new(models.CygxReportMappingCategoryGroup)
+//		item.ChartPermissionId = v.ChartPermissionId
+//		item.ArticleId = v.ArticleId
+//		item.IdCygx = 40
+//		item.CreateTime = time.Now()
+//		item.ModifyTime = time.Now()
+//		item.PermissionType = v.PermissionType
+//		items = append(items, item)
+//	}
+//	fmt.Println(len(items))
+//	for _, v := range items {
+//		fmt.Println(v)
+//	}
+//
+//	e = models.AddCygxReportMappingCategoryGroupMultiInit(items)
+//	fmt.Println(e)
+//}