fix

controller/census/income_list.go

@@ -1378,8 +1378,8 @@ func getCensusIncomeList(ch chan base.BaseData, req fms.IncomeListReq) (baseData
 				}
 
 				if req.Keyword != "" {
-					cond += ` AND company_name LIKE ?`
-					pars = append(pars, "%"+req.Keyword+"%")
+					histrtyCond += ` AND company_name LIKE ?`
+					historyPars = append(historyPars, "%"+req.Keyword+"%")
 				}
 
 				results, total, e := fms.GetIncomeHistoryPage(histrtyCond, historyPars, page)
@@ -1452,8 +1452,8 @@ func getCensusIncomeList(ch chan base.BaseData, req fms.IncomeListReq) (baseData
 					}
 
 					if req.Keyword != "" {
-						cond += ` AND c.company_name LIKE ?`
-						pars = append(pars, "%"+req.Keyword+"%")
+						amountCond += ` AND c.company_name LIKE ?`
+						amountPars = append(amountPars, "%"+req.Keyword+"%")
 					}
 
 					results, total, e := fms.GetContractSummaryPaymentIncomeAmountPage(amountCond, amountPars, page)
@@ -1503,8 +1503,8 @@ func getCensusIncomeList(ch chan base.BaseData, req fms.IncomeListReq) (baseData
 				historyPars = append(historyPars, st, ed)
 
 				if req.Keyword != "" {
-					cond += ` AND company_name LIKE ?`
-					pars = append(pars, "%"+req.Keyword+"%")
+					histrtyCond += ` AND company_name LIKE ?`
+					historyPars = append(pars, "%"+req.Keyword+"%")
 				}
 
 				results, e := fms.GetIncomeHistory(histrtyCond, historyPars)
@@ -1538,8 +1538,8 @@ func getCensusIncomeList(ch chan base.BaseData, req fms.IncomeListReq) (baseData
 					}
 
 					if req.Keyword != "" {
-						cond += ` AND c.company_name LIKE ?`
-						pars = append(pars, "%"+req.Keyword+"%")
+						amountCond += ` AND c.company_name LIKE ?`
+						amountPars = append(amountPars, "%"+req.Keyword+"%")
 					}
 
 					results, e := fms.GetContractSummaryIncomeAmount(amountCond, amountPars)
@@ -1594,8 +1594,8 @@ func getCensusIncomeList(ch chan base.BaseData, req fms.IncomeListReq) (baseData
 			//旧查询
 
 			if req.Keyword != "" {
-				cond += ` AND company_name LIKE ?`
-				pars = append(pars, "%"+req.Keyword+"%")
+				histrtyCond += ` AND company_name LIKE ?`
+				historyPars = append(pars, "%"+req.Keyword+"%")
 			}
 
 			results, e := fms.GetIncomeHistory(histrtyCond, historyPars)
@@ -1631,8 +1631,8 @@ func getCensusIncomeList(ch chan base.BaseData, req fms.IncomeListReq) (baseData
 				}
 
 				if req.Keyword != "" {
-					cond += ` AND c.company_name LIKE ?`
-					pars = append(pars, "%"+req.Keyword+"%")
+					amountCond += ` AND c.company_name LIKE ?`
+					amountPars = append(pars, "%"+req.Keyword+"%")
 				}
 
 				results, e := fms.GetContractSummaryIncomeAmount(amountCond, amountPars)