Merge remote-tracking branch 'origin/master'

ent/entity/customer.go

@@ -271,7 +271,7 @@ func (this *Customer) GetDeptCustomerList(dept_id, ent_id int, name, alloc, staf
 	customerList = &[]map[string]interface{}{}
 	searchSql := ` 1=1 `
 	searchValues := []interface{}{}
-	searchValues = append(searchValues, dept_id, dept_id, ent_id)
+	searchValues = append(searchValues, dept_id, dept_id, ent_id, ent_id)
 	if name != "" { //名字模糊查询
 		searchSql += ` and b.name like ? `
 		searchValues = append(searchValues, "%"+name+"%")
@@ -362,7 +362,7 @@ func (this *Customer) GetDeptCustomerList(dept_id, ent_id int, name, alloc, staf
 						) b ON ( a.user_id = b.id ) 
 				 limit 100000) as a
 					LEFT JOIN entniche_customer b ON ( a.customer_id = b.id ) 
-				AND b.ent_id = 14640 
+				AND b.ent_id = ? 
 				AND b.state = 1
 				LEFT JOIN entniche_user c ON ( a.user_id = c.id ) WHERE ` + searchSql + ` 
 							GROUP BY  a.customer_id  ` + allocSql + ` order by updatetime desc,	b.createtime desc `
@@ -397,7 +397,7 @@ func (this *Customer) GetDeptCustomerList(dept_id, ent_id int, name, alloc, staf
 						) b ON ( a.user_id = b.id ) limit 100000
 				   ) as a
 					LEFT JOIN entniche_customer b ON ( a.customer_id = b.id ) 
-				AND b.ent_id = 14640 
+				AND b.ent_id = ? 
 				AND b.state = 1
 				LEFT JOIN entniche_user c ON ( a.user_id = c.id )  WHERE ` + searchSql + `
 							GROUP BY  a.customer_id  ` + allocSql + ` order by updatetime desc,	b.createtime desc `