fix 客户审批，客户审批搜索修复

controllers/approval.go

@@ -694,7 +694,7 @@ func (c *ApprovalCommon) CompanyList() {
 		return
 	}
 	companyNameList := make([]string, 0)
-	list, err := company_approval.GetCompanyNameList(c.AdminWx.AdminId, c.AdminWx.RoleTypeCode, keyword)
+	list, err := company_approval.GetCompanyNameList(c.AdminWx.AdminId, keyword)
 	if err != nil {
 		c.FailWithMessage("获取客户名称列表失败！", "获取客户名称列表失败,ERR:"+err.Error())
 		return

controllers/approval_new.go

@@ -46,8 +46,6 @@ func (c *ApprovalCommon) ListV2() {
 	//归属
 	if status == "待审批" {
 		condition += ` AND ( (((c.apply_user_id = ? and a.start_node_id = a.curr_node_id) OR (f.approve_user_id = ? and a.curr_node_id=f.node_id ) ) and c.approve_status="待审批") or (f.approve_user_id = ? and a.curr_node_id > f.node_id and f.node_type="cc") )`
-		//condition += ` AND ( (((c.user_id = ? and a.start_node_id = a.curr_node_id) OR (d.approve_user_id = ? and a.curr_node_id=d.node_id)) and d.status="待审批") or (d.approve_user_id = ? and a.curr_node_id > d.node_id and d.node_type="cc") )`
-
 		pars = append(pars, sysUser.AdminId, sysUser.AdminId, sysUser.AdminId)
 	} else {
 		condition += ` AND (c.apply_user_id = ? or (f.approve_user_id = ? and f.node_id <= a.curr_node_id) )`
@@ -73,12 +71,12 @@ func (c *ApprovalCommon) ListV2() {
 
 	//关键字
 	if keyword != "" {
-		condition += ` AND ( c.company_name LIKE '%` + keyword + `%' OR c.credit_code LIKE '%` + keyword + `%' ) `
+		condition += ` AND ( e.company_name LIKE '%` + keyword + `%' OR e.credit_code LIKE '%` + keyword + `%' ) `
 	}
 	//关键字（全等）
 	if keywordEq != "" {
-		condition += ` AND  c.company_name =? `
-		pars = append(pars, keywordEq, keywordEq)
+		condition += ` AND  e.company_name =? `
+		pars = append(pars, keywordEq)
 	}
 
 	var startSize int

models/tables/company_approval/company_approval.go

@@ -913,7 +913,7 @@ type CompanyNameList struct {
 }
 
 // GetCompanyNameList 获取客户名称列表数据
-func GetCompanyNameList(userId int, userRoleTypeCode, keyword string) (list []*CompanyNameList, err error) {
+func GetCompanyNameListOld(userId int, userRoleTypeCode, keyword string) (list []*CompanyNameList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT a.company_name FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id
@@ -923,3 +923,18 @@ group by a.company_name order by c.modify_time DESC `
 	_, err = o.Raw(sql, userId, userId, userRoleTypeCode).QueryRows(&list)
 	return
 }
+
+// GetCompanyNameList 获取客户名称列表数据
+func GetCompanyNameList(userId int, keyword string) (list []*CompanyNameList, err error) {
+	o := orm.NewOrm()
+
+	sql := `SELECT e.company_name from contract_approval a
+	join  ( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 and approval_type="company"  GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
+			INNER JOIN company_approval AS c ON a.contract_id=c.company_approval_id
+			INNER JOIN company_product AS d ON d.company_id=c.company_id AND d.product_id=c.product_id
+			INNER JOIN company AS e ON e.company_id=d.company_id
+	JOIN contract_approval_record f on a.contract_approval_id=f.contract_approval_id 
+ 			WHERE 1=1 and  a.approval_type="company"  AND (c.apply_user_id = ? or (f.approve_user_id = ? and f.node_id <= a.curr_node_id) ) AND c.approve_status !="已撤回" and( e.company_name like '%` + keyword + `%' or  e.credit_code like '%` + keyword + `%')  group by company_name`
+	_, err = o.Raw(sql, userId, userId).QueryRows(&list)
+	return
+}