Merge branch 'fms_3.1' into debug

controller/census/income_list.go

@@ -1378,7 +1378,7 @@ func getCensusIncomeList(ch chan base.BaseData, req fms.IncomeListReq) (baseData
 				}
 
 				if req.Keyword != "" {
-					histrtyCond += ` AND company_name LIKE ?`
+					histrtyCond += ` AND company_name LIKE ? `
 					historyPars = append(historyPars, "%"+req.Keyword+"%")
 				}
 
@@ -1504,7 +1504,7 @@ func getCensusIncomeList(ch chan base.BaseData, req fms.IncomeListReq) (baseData
 
 				if req.Keyword != "" {
 					histrtyCond += ` AND company_name LIKE ?`
-					historyPars = append(pars, "%"+req.Keyword+"%")
+					historyPars = append(historyPars, "%"+req.Keyword+"%")
 				}
 
 				results, e := fms.GetIncomeHistory(histrtyCond, historyPars)
@@ -1632,7 +1632,7 @@ func getCensusIncomeList(ch chan base.BaseData, req fms.IncomeListReq) (baseData
 
 				if req.Keyword != "" {
 					amountCond += ` AND c.company_name LIKE ?`
-					amountPars = append(pars, "%"+req.Keyword+"%")
+					amountPars = append(amountPars, "%"+req.Keyword+"%")
 				}
 
 				results, e := fms.GetContractSummaryIncomeAmount(amountCond, amountPars)