no message

controllers/cygx/enter_score.go

@@ -850,19 +850,16 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 	}
 
 	newlencompanyIds := len(newcompanyIds)
-
 	if newlencompanyIds > 0 {
 		companyCondition += ` AND a.company_id IN (` + utils.GetOrmInReplace(newlencompanyIds) + `)`
 		companypars = append(companypars, newcompanyIds)
 	}
-
 	companyList, err := company.GetCompanyIdListByproductName(companyCondition, companypars)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-
 	var condition string
 	var pars []interface{}
 	if endDate != "" {
@@ -878,12 +875,18 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 		condition += ` AND securities_firms_name LIKE '%` + keyWord + `%' `
 	}
 
+	if newlencompanyIds > 0 {
+		condition += ` AND company_id IN (` + utils.GetOrmInReplace(newlencompanyIds) + `)`
+		pars = append(pars, newcompanyIds)
+	}
+
 	total, err := cygx.GetCygxEnterScoreCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+
 	if total > 0 {
 		list, err := cygx.GetCygxEnterScoreList(condition, pars, 0, 100)
 		if err != nil {
@@ -1105,8 +1108,9 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 				mergeProportionTotal = fmt.Sprint(item.MergeProportion)
 			}
 			//if mapenterScoreTypeCompanyIds[vC.CompanyId] { //按照百分比展示的拼接 %
-			mergeProportionTotal += "%"
-			//}
+			if mapenterScoreProportionTotal[vC.CompanyId] > 0 {
+				mergeProportionTotal += "%"
+			}
 			rankingText = append(rankingText, ranking)
 			securitiesFirmsNameText = append(securitiesFirmsNameText, securitiesFirmsName)
 			proportionTotalText = append(proportionTotalText, proportionTotal)
@@ -1152,7 +1156,7 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 			}
 			item := new(cygx.EnterScorePermissionListResp)
 			item.ChartPermissionName = v.PermissionName
-			item.ProportionListText = make([]string, 0)
+			item.ProportionListText = make([]string, len(companyList))
 			item.List = make([]*cygx.EnterScoreRealNameListResp, 0)
 			resp.ListPermission = append(resp.ListPermission, item)
 		}
@@ -1161,7 +1165,7 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 		for _, v := range groupNameArr {
 			item := new(cygx.EnterScoreGroupListResp)
 			item.GroupName = v
-			item.ProportionListText = make([]string, 0)
+			item.ProportionListText = make([]string, len(companyList))
 			resp.ListGroup = append(resp.ListGroup, item)
 		}
 		//resp.ListPermission = make([]*cygx.EnterScorePermissionListResp, 0)