Merge branch 'aj_overseas_custorm' into debug

# Conflicts:
#	models/overseas_custom/custom.go

models/overseas_custom/custom.go

@@ -154,7 +154,7 @@ func (obj *Custom) UpdateEnglishCompanyOverseasStatus(companyId int, companyStat
 
 func (obj *Custom) UpdateCompanyOverseasStatus(companyId int, companyStatus string) (err error) {
 	o := orm.NewOrm()
-	sql := ` UPDATE company SET overseas_status=? WHERE company_id=? AND overseas_status<>'正式'`
+	sql := ` UPDATE company SET overseas_status=? WHERE company_id=? AND overseas_status<>'正式' `
 	_, err = o.Raw(sql, companyStatus, companyId).Exec()
 	return
 }

services/overseas_custom/custom.go

@@ -77,16 +77,20 @@ func FixCompanyOverseasStatus(cont context.Context) (err error) {
 	for _, v := range list {
 		if v.CompanyId > utils.EnCompanyIdStep {
 			v.CompanyId = v.CompanyId - utils.EnCompanyIdStep
-			err = obj.UpdateEnglishCompanyOverseasStatus(v.CompanyId, v.CompanyStatus)
-			if err != nil {
-				fmt.Println("UpdateEnglishCompanyOverseasStatusErr:" + err.Error())
-				return err
+			if v.CompanyStatus != "" {
+				err = obj.UpdateEnglishCompanyOverseasStatus(v.CompanyId, v.CompanyStatus)
+				if err != nil {
+					fmt.Println("UpdateEnglishCompanyOverseasStatusErr:" + err.Error())
+					return err
+				}
 			}
 		} else {
-			err = obj.UpdateCompanyOverseasStatus(v.CompanyId, v.CompanyStatus)
-			if err != nil {
-				fmt.Println("UpdateCompanyOverseasStatus:" + err.Error())
-				return err
+			if v.CompanyStatus != "" {
+				err = obj.UpdateCompanyOverseasStatus(v.CompanyId, v.CompanyStatus)
+				if err != nil {
+					fmt.Println("UpdateCompanyOverseasStatus:" + err.Error())
+					return err
+				}
 			}
 		}
 	}