|
|
@@ -468,7 +468,7 @@ func (this *CompanyController) List() {
|
|
|
keyWord = strings.Replace(keyWord, "'", "", -1)
|
|
|
todoStatus := this.GetString("TodoStatus") //任务状态
|
|
|
tryStage, _ := this.GetInt("TryStage") //试用客户标签
|
|
|
- includeShare, _ := this.GetBool("IncludeShare") // 是否包含试用客户
|
|
|
+ //includeShare, _ := this.GetBool("IncludeShare") // 是否包含试用客户
|
|
|
|
|
|
// 套餐类型
|
|
|
packageType, _ := this.GetInt("PackageType")
|
|
|
@@ -800,13 +800,13 @@ func (this *CompanyController) List() {
|
|
|
//pars = append(pars, sysUser.AdminId)
|
|
|
|
|
|
// 是否包含共享客户(新增合同时, 关键词搜索客户为true)
|
|
|
- if includeShare {
|
|
|
- condition += ` AND (b.seller_id = ? OR (b.share_seller_id = ? AND b.is_share = 1)) `
|
|
|
- pars = append(pars, sysUser.AdminId, sysUser.AdminId)
|
|
|
- } else {
|
|
|
- condition += ` AND b.seller_id = ? `
|
|
|
- pars = append(pars, sysUser.AdminId)
|
|
|
- }
|
|
|
+ //if includeShare {
|
|
|
+ condition += ` AND (b.seller_id = ? OR (b.share_seller_id = ? AND b.is_share = 1)) `
|
|
|
+ pars = append(pars, sysUser.AdminId, sysUser.AdminId)
|
|
|
+ // } else {
|
|
|
+ // condition += ` AND b.seller_id = ? `
|
|
|
+ // pars = append(pars, sysUser.AdminId)
|
|
|
+ // }
|
|
|
}
|
|
|
|
|
|
permissionCondition += ` AND (b.seller_id=? OR (b.share_seller_id = ? AND b.is_share = 1)) `
|
