选择不做任何推送的时候的产业保存处理

controllers/user.go

@@ -204,58 +204,73 @@ func (this *UserController) ChooseSubmit() {
 	var industrialManagementIds string
 	var categoryIds string
 	industrialManagementList := req.IndustrialManagementIds
-	for _, v := range industrialManagementList {
-		//如果为空就不做拼接处理
-		if v.IndustrialManagementIds == "" {
-			continue
-		}
-		if v.ChartPermissionId != utils.CE_LUE_ID {
-			industrialManagementIds += v.IndustrialManagementIds + ","
-		} else {
-			categoryIds += v.IndustrialManagementIds + ","
-		}
+	isRefuse := req.IsRefuse
+	isSubjective := req.IsSubjective
+	isObjective := req.IsObjective
+	if isRefuse == 0 && isSubjective == 0 && isObjective == 0 {
+		br.Msg = "请至少选择一项主客观内容"
+		return
 	}
-
 	var itemsFllow []*models.CygxIndustryFllow
-	industrialManagementIds = strings.TrimRight(industrialManagementIds, ",")
-	if industrialManagementIds != "" {
-		sliceIndustrial := strings.Split(industrialManagementIds, ",")
-		for _, v := range sliceIndustrial {
-			item := new(models.CygxIndustryFllow)
-			industrialManagementId, _ := strconv.Atoi(v)
-			item.IndustrialManagementId = industrialManagementId
-			item.UserId = user.UserId
-			item.Mobile = user.Mobile
-			item.Email = user.Email
-			item.CompanyId = user.CompanyId
-			item.CompanyName = user.CompanyName
-			item.RealName = user.RealName
-			item.Type = 1
-			item.CreateTime = time.Now()
-			item.ModifyTime = time.Now()
-			item.Source = 2
-			itemsFllow = append(itemsFllow, item)
+	var itemsCategory []*models.CygxXzsChooseCategory
+
+	//如果为1 则不做任何推送 ，主观客观默认改成0
+	if isRefuse == 1 {
+		isSubjective = 0
+		isObjective = 0
+	} else {
+		for _, v := range industrialManagementList {
+			//如果为空就不做拼接处理
+			if v.IndustrialManagementIds == "" {
+				continue
+			}
+			if v.ChartPermissionId != utils.CE_LUE_ID {
+				industrialManagementIds += v.IndustrialManagementIds + ","
+			} else {
+				categoryIds += v.IndustrialManagementIds + ","
+			}
 		}
-	}
 
-	//处理策略
-	var itemsCategory []*models.CygxXzsChooseCategory
-	categoryIds = strings.TrimRight(categoryIds, ",")
-	if categoryIds != "" {
-		sliceCategoryId := strings.Split(categoryIds, ",")
-		for _, v := range sliceCategoryId {
-			item := new(models.CygxXzsChooseCategory)
-			categoryId, _ := strconv.Atoi(v)
-			item.CategoryId = categoryId
-			item.UserId = user.UserId
-			item.Mobile = user.Mobile
-			item.Email = user.Email
-			item.CompanyId = user.CompanyId
-			item.CompanyName = user.CompanyName
-			item.RealName = user.RealName
-			item.CreateTime = time.Now()
-			item.ModifyTime = time.Now()
-			itemsCategory = append(itemsCategory, item)
+		industrialManagementIds = strings.TrimRight(industrialManagementIds, ",")
+		if industrialManagementIds != "" {
+			sliceIndustrial := strings.Split(industrialManagementIds, ",")
+			for _, v := range sliceIndustrial {
+				item := new(models.CygxIndustryFllow)
+				industrialManagementId, _ := strconv.Atoi(v)
+				item.IndustrialManagementId = industrialManagementId
+				item.UserId = user.UserId
+				item.Mobile = user.Mobile
+				item.Email = user.Email
+				item.CompanyId = user.CompanyId
+				item.CompanyName = user.CompanyName
+				item.RealName = user.RealName
+				item.Type = 1
+				item.CreateTime = time.Now()
+				item.ModifyTime = time.Now()
+				item.Source = 2
+				itemsFllow = append(itemsFllow, item)
+			}
+		}
+
+		//处理策略
+
+		categoryIds = strings.TrimRight(categoryIds, ",")
+		if categoryIds != "" {
+			sliceCategoryId := strings.Split(categoryIds, ",")
+			for _, v := range sliceCategoryId {
+				item := new(models.CygxXzsChooseCategory)
+				categoryId, _ := strconv.Atoi(v)
+				item.CategoryId = categoryId
+				item.UserId = user.UserId
+				item.Mobile = user.Mobile
+				item.Email = user.Email
+				item.CompanyId = user.CompanyId
+				item.CompanyName = user.CompanyName
+				item.RealName = user.RealName
+				item.CreateTime = time.Now()
+				item.ModifyTime = time.Now()
+				itemsCategory = append(itemsCategory, item)
+			}
 		}
 	}
 	mobile := user.Mobile
@@ -269,8 +284,8 @@ func (this *UserController) ChooseSubmit() {
 	item.CreateTime = time.Now()
 	item.ModifyTime = time.Now()
 	item.IsRefuse = req.IsRefuse
-	item.IsSubjective = req.IsSubjective
-	item.IsObjective = req.IsObjective
+	item.IsSubjective = isSubjective
+	item.IsObjective = isObjective
 	count, err := models.GetXzsChooseSendCountByMobile(mobile)
 	if err != nil {
 		br.Msg = "获取信息失败"

models/xzs_choose_send.go

@@ -53,34 +53,37 @@ func AddCygxXzsChooseSend(item *CygxXzsChooseSend, itemsFllow []*CygxIndustryFll
 		}
 	}()
 
-	//删除原有的关注记录
-	sql := `DELETE FROM cygx_industry_fllow WHERE mobile = ?`
-	_, err = o.Raw(sql, item.Mobile).Exec()
-	if err != nil {
-		return err
-	}
-
-	if len(itemsFllow) > 0 {
-		//批量添加新的关注记录
-		_, err = o.InsertMulti(len(itemsFllow), itemsFllow)
+	//如果用户选择不做任何推送，则之前的关注信息不做任何改动
+	if item.IsRefuse == 0 {
+		//删除原有的关注记录
+		sql := `DELETE FROM cygx_industry_fllow WHERE mobile = ?`
+		_, err = o.Raw(sql, item.Mobile).Exec()
 		if err != nil {
 			return err
 		}
-	}
 
-	//删除原有策略报告的关注记录
-	sql = `DELETE FROM cygx_xzs_choose_category WHERE mobile = ?`
-	_, err = o.Raw(sql, item.Mobile).Exec()
-	if err != nil {
-		return err
-	}
+		if len(itemsFllow) > 0 {
+			//批量添加新的关注记录
+			_, err = o.InsertMulti(len(itemsFllow), itemsFllow)
+			if err != nil {
+				return err
+			}
+		}
 
-	if len(itemsCategory) > 0 {
-		//批量添加新的关注记录
-		_, err = o.InsertMulti(len(itemsCategory), itemsCategory)
+		//删除原有策略报告的关注记录
+		sql = `DELETE FROM cygx_xzs_choose_category WHERE mobile = ?`
+		_, err = o.Raw(sql, item.Mobile).Exec()
 		if err != nil {
 			return err
 		}
+
+		if len(itemsCategory) > 0 {
+			//批量添加新的关注记录
+			_, err = o.InsertMulti(len(itemsCategory), itemsCategory)
+			if err != nil {
+				return err
+			}
+		}
 	}
 
 	//添加所勾选的消息类型
@@ -110,34 +113,37 @@ func UpdateCygxXzsChooseSend(item *CygxXzsChooseSend, itemsFllow []*CygxIndustry
 		}
 	}()
 
-	//删除原有的关注记录
-	sql := `DELETE FROM cygx_industry_fllow WHERE mobile = ?`
-	_, err = o.Raw(sql, item.Mobile).Exec()
-	if err != nil {
-		return err
-	}
-
-	if len(itemsFllow) > 0 {
-		//批量添加新的关注记录
-		_, err = o.InsertMulti(len(itemsFllow), itemsFllow)
+	//如果用户选择不做任何推送，则之前的关注信息不做任何改动
+	if item.IsRefuse == 0 {
+		//删除原有的关注记录
+		sql := `DELETE FROM cygx_industry_fllow WHERE mobile = ?`
+		_, err = o.Raw(sql, item.Mobile).Exec()
 		if err != nil {
 			return err
 		}
-	}
 
-	//删除原有策略报告的关注记录
-	sql = `DELETE FROM cygx_xzs_choose_category WHERE mobile = ?`
-	_, err = o.Raw(sql, item.Mobile).Exec()
-	if err != nil {
-		return err
-	}
+		if len(itemsFllow) > 0 {
+			//批量添加新的关注记录
+			_, err = o.InsertMulti(len(itemsFllow), itemsFllow)
+			if err != nil {
+				return err
+			}
+		}
 
-	if len(itemsCategory) > 0 {
-		//批量添加新的关注记录
-		_, err = o.InsertMulti(len(itemsCategory), itemsCategory)
+		//删除原有策略报告的关注记录
+		sql = `DELETE FROM cygx_xzs_choose_category WHERE mobile = ?`
+		_, err = o.Raw(sql, item.Mobile).Exec()
 		if err != nil {
 			return err
 		}
+
+		if len(itemsCategory) > 0 {
+			//批量添加新的关注记录
+			_, err = o.InsertMulti(len(itemsCategory), itemsCategory)
+			if err != nil {
+				return err
+			}
+		}
 	}
 
 	//修改现有的类型