no message

controllers/cygx/enter_score.go

@@ -728,21 +728,24 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 		}
 		var newcompanyIds []int
 		lencompanyIds := len(companyIds)
-
+		var searchcompanyIds []int
 		//如果机构搜索做了限制 ，那么公司列表的纵向展示也做限制
 		if keyWord != "" {
-			var searchcompanyIds []int
 			for _, v := range list {
 				searchcompanyIds = append(searchcompanyIds, v.CompanyId)
 			}
-			newcompanyIds = utils.IntersectInt(searchcompanyIds, companyIds) //获取销售可见权限，与搜索权限的交集
+			if lencompanyIds > 0 {
+				newcompanyIds = utils.IntersectInt(searchcompanyIds, companyIds) //获取销售可见权限，与搜索权限的交集
+			} else {
+				newcompanyIds = searchcompanyIds
+			}
 		} else {
 			newcompanyIds = companyIds
 		}
 
 		newlencompanyIds := len(newcompanyIds)
 
-		if lencompanyIds > 0 {
+		if newlencompanyIds > 0 {
 			companyCondition += ` AND a.company_id IN (` + utils.GetOrmInReplace(newlencompanyIds) + `)`
 			companypars = append(companypars, newcompanyIds)
 		}

models/company/company_approval.go

@@ -332,8 +332,8 @@ func TryOutToFormalXClassRai(companyId, productId, sellerId, companyApprovalId,
 		go AddCompanyPermissionLog(cpLog)
 	}
 
-	sql = `UPDATE company_report_permission SET  status='永续', end_date=? WHERE  company_id=?  ` // 更改权限的开始时间结束时间
-	_, err = to.Raw(sql, endDate, companyId).Exec()
+	sql = `DELETE FROM company_report_permission WHERE company_id=? AND product_id=?`
+	_, err = to.Raw(sql, companyId, productId).Exec()
 	if err != nil {
 		return
 	}
@@ -353,7 +353,7 @@ func TryOutToFormalXClassRai(companyId, productId, sellerId, companyApprovalId,
 			LastUpdatedTime:    time.Now(),
 			ChartPermissionId:  pv.ChartPermissionId,
 			StartDate:          pv.StartDate,
-			EndDate:            pv.EndDate,
+			EndDate:            endDate,
 			ProductId:          productId,
 			ProductName:        productName,
 			CompanyContractId:  companyContractId,
@@ -362,8 +362,20 @@ func TryOutToFormalXClassRai(companyId, productId, sellerId, companyApprovalId,
 			IsUpgrade:          pv.IsUpgrade,
 			ExpensiveYx:        pv.ExpensiveYx,
 		}
+		newId, tmpErr := to.Insert(tmpCompanyReportPermission)
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+		tmpCompanyReportPermission.CompanyReportPermissionId = newId
 		newCompanyReportPermissionList = append(newCompanyReportPermissionList, tmpCompanyReportPermission)
 	}
+	sql = `UPDATE company_report_permission SET  status='永续', end_date=? WHERE  company_id=?  ` // 更改权限的开始时间结束时间
+	_, err = to.Raw(sql, endDate, companyId).Exec()
+	if err != nil {
+		return
+	}
+
 	sql = `UPDATE company_contract SET status=1 WHERE company_contract_id=? AND company_id=? AND product_id=? `
 	_, err = to.Raw(sql, companyContractId, companyId, productId).Exec()
 	if err != nil {