|
@@ -71,6 +71,7 @@ func (this *ActivityCoAntroller) ActivityList() {
|
|
|
br.ErrMsg = "请登录,SysUser Is Empty"
|
|
|
return
|
|
|
}
|
|
|
+ fmt.Println(user.Mobile)
|
|
|
uid := user.UserId
|
|
|
pageSize, _ := this.GetInt("PageSize")
|
|
|
currentIndex, _ := this.GetInt("CurrentIndex")
|
|
@@ -141,12 +142,10 @@ func (this *ActivityCoAntroller) ActivityList() {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- fmt.Println(userType)
|
|
|
if isShowJurisdiction == 1 && chartPermissionIds == "" && userType == 4 {
|
|
|
activityTypeIds = "1,3"
|
|
|
}
|
|
|
|
|
|
- fmt.Println(userType)
|
|
|
var startSize int
|
|
|
if pageSize <= 0 {
|
|
|
pageSize = utils.PageSize20
|
|
@@ -158,11 +157,12 @@ func (this *ActivityCoAntroller) ActivityList() {
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
|
//活动可见限制
|
|
|
- condition += ` AND (is_limit_people = 0 OR(is_limit_people = 1 AND customer_type_ids LIKE'%` + strconv.Itoa(userType) + `%')) `
|
|
|
+
|
|
|
+ var sqlExport string
|
|
|
if userType == 3 && strings.Contains(permissionStr, "专家") {
|
|
|
- condition += ` AND (is_limit_people = 0 OR(is_limit_people = 1 AND customer_type_ids LIKE'%4%')) `
|
|
|
+ sqlExport = ` OR ( is_limit_people = 1 OR customer_type_ids LIKE '%4%' ) `
|
|
|
}
|
|
|
-
|
|
|
+ condition += ` AND (is_limit_people = 0 OR(is_limit_people = 1 AND customer_type_ids LIKE'%` + strconv.Itoa(userType) + `%') ` + sqlExport + `) `
|
|
|
if keyWord != "" {
|
|
|
condition += ` AND (art.activity_name LIKE '%` + keyWord + `%' )`
|
|
|
}
|