|
|
@@ -391,7 +391,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
|
|
|
}
|
|
|
notRenewalCompanyTotal = total
|
|
|
|
|
|
- notRenewalCompanyToBeConfirmTotal, err = company.GetIncrementalRenewalCompanyProductMergeCount(notRenewalToBeCondition, notRenewalToBePars)
|
|
|
+ notRenewalCompanyToBeConfirmTotal, err = company.GetIncrementalRenewalCompanyProductMergeCount(notRenewalToBeCondition+` AND a.not_renewal_hide = 0 AND c.status not in ("永续","正式","关闭") `, notRenewalToBePars)
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
br.Msg = "获取失败"
|
|
|
br.ErrMsg = "获取失败，Err:" + err.Error()
|
|
|
@@ -399,8 +399,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
|
|
|
}
|
|
|
|
|
|
if isConfirm != 2 {
|
|
|
- condition1 += ` AND a.not_renewal_hide = 0 `
|
|
|
- condition1 += ` AND c.status not in ("永续","正式","关闭") `
|
|
|
+ condition1 += ` AND a.not_renewal_hide = 0 AND c.status not in ("永续","正式","关闭") `
|
|
|
}
|
|
|
|
|
|
//if isConfirm == 1 {
|
|
|
@@ -519,7 +518,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
|
|
|
v.PermissionName = mappermissionName[v.CompanyContractId]
|
|
|
v.IsUserMaker = mapIsUserMaker[v.CompanyId]
|
|
|
}
|
|
|
- notRenewalCompanyToBeConfirmTotal = notRenewalTryOut // 展示数据替换
|
|
|
+
|
|
|
page := paging.GetPaging(currentIndex, pageSize, dataTotal)
|
|
|
resp := response.IncrementalCompanyListResp{
|
|
|
Paging: page,
|
