修改海外客户列表bug

controllers/company_user.go

@@ -6314,7 +6314,7 @@ func (this *CompanyUserController) ListByReport() {
 		order = fmt.Sprintf(` ORDER BY %s %s`, pMap[sortParam], tMap[sortType])
 	}
 
-	total, err := company.GetCompanyUserCount(companyId)
+	total, err := company.GetCompanyUserListByReportCount(companyId)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据总数失败，Err:" + err.Error()

controllers/english_report/english_company.go

@@ -293,7 +293,11 @@ func (this *EnglishCompanyController) Save() {
 		item.ModifyTime = nowTime
 		item.Status = 1
 		item.Enabled = 1
-		item.Nation = req.Nation
+		if req.Country != "" && req.Nation == "" {
+			item.Nation = req.Country
+		} else {
+			item.Nation = req.Nation
+		}
 		item.OverseasLabel = 1
 		if e = item.Create(); e != nil {
 			br.Msg = "保存失败"

controllers/overseas_custom/custom.go

@@ -101,6 +101,15 @@ func (this *OverseasCustomController) CustomList() {
 	if customType == 2 {
 		condition += ` AND m.is_hide=? `
 		pars = append(pars, 1)
+	} else {
+		condition += ` AND m.is_hide=? `
+		pars = append(pars, 0)
+	}
+
+	if companyStatus == "试用" {
+		condition += ` AND m.company_status='试用' AND m.overseas_status='' `
+	} else if companyStatus == "正式" {
+		condition += ` AND m.company_status='正式' `
 	}
 
 	total, err := obj.GetCustomListCount(condition, pars, companyStatus)

models/company/company_user.go

@@ -498,6 +498,13 @@ type CompanyViewPageListResp struct {
 	Paging *paging.PagingItem `description:"分页数据"`
 }
 
+func GetCompanyUserListByReportCount(companyId int) (count int, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT COUNT(1) AS count FROM wx_user WHERE  company_id =? AND ficc_view_total>0 `
+	err = o.Raw(sql, companyId).QueryRow(&count)
+	return
+}
+
 // GetCompanyUserListByReport
 // @Description: 根据报告阅读情况获取联系人列表
 // @author: Roc
@@ -510,7 +517,7 @@ type CompanyViewPageListResp struct {
 // @return err error
 func GetCompanyUserListByReport(companyId, startSize, pageSize int, order string) (items []*CompanyUser, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM wx_user  WHERE company_id = ? `
+	sql := `SELECT * FROM wx_user  WHERE company_id = ? AND ficc_view_total>0 `
 
 	if order != "" {
 		sql += order

models/english_report_email.go

@@ -283,7 +283,7 @@ b.company_name AS company_name,a.company_name AS register_company_name FROM engl
 func GetEnCompanyIdsByKeyword(keyword string) (companyIds []int, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT DISTINCT
-				a.company_id
+				a.company_id+10000000
 			FROM
 				english_report_email AS a
 			JOIN english_company AS b ON a.company_id = b.company_id AND b.is_deleted = 0

models/overseas_custom/custom.go

@@ -202,6 +202,8 @@ func (obj *Custom) GetCustomList(condition string, pars []interface{}, companySt
 			sortFieldStr = "road_show_total"
 		} else if sortField == "CreateTime" {
 			sortFieldStr = "create_time"
+		} else if sortField == "LastViewTime" {
+			sortFieldStr = "last_view_time"
 		}
 	}