Merge branch 'aj_overseas_custorm'

controllers/english_report/english_company.go

@@ -327,7 +327,8 @@ func (this *EnglishCompanyController) Save() {
 		item.SellerId = req.SellerId
 		item.SellerName = seller.RealName
 		item.ModifyTime = nowTime
-		updateCols := []string{"CompanyName", "CountryCode", "Country", "SellerId", "SellerName", "ModifyTime"}
+		item.Nation = req.Nation
+		updateCols := []string{"CompanyName", "CountryCode", "Country", "SellerId", "SellerName", "ModifyTime", "Nation"}
 		if e = item.Update(updateCols); e != nil {
 			br.Msg = "保存失败"
 			br.ErrMsg = "更新英文客户信息失败, Err:" + e.Error()

controllers/overseas_custom/sale.go

@@ -77,13 +77,13 @@ func (this *OverseasCustomController) SaleSave() {
 					br.ErrMsg = "保存失败,处理特定销售客户信息失败,Err:" + err.Error()
 					return
 				}
-			}
-			//修改客户状态
-			err = obj.HandelCompanyStatus(v)
-			if err != nil {
-				br.Msg = "保存失败！"
-				br.ErrMsg = "保存失败,同步客户状态失败,Err:" + err.Error()
-				return
+				//修改客户状态
+				err = obj.HandelCompanyStatus(v)
+				if err != nil {
+					br.Msg = "保存失败！"
+					br.ErrMsg = "保存失败,同步客户状态失败,Err:" + err.Error()
+					return
+				}
 			}
 		}
 	}