|
@@ -158,6 +158,8 @@ func (this *ActivityCoAntroller) ActivityList() {
|
|
|
}
|
|
|
}
|
|
|
permissionSqlStr = strings.TrimRight(permissionSqlStr, ",")
|
|
|
+ permissionSqlStr = strings.Replace(permissionSqlStr, "(主观)", "", -1)
|
|
|
+ permissionSqlStr = strings.Replace(permissionSqlStr, "(客观)", "", -1)
|
|
|
permissionSqlStr = ` AND art.chart_permission_name IN (` + permissionSqlStr + `)`
|
|
|
sqlExport = ` AND (art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
|
|
|
if userType == 2 {
|
|
@@ -1876,6 +1878,8 @@ func (this *ActivityCoAntroller) LabelList() {
|
|
|
}
|
|
|
}
|
|
|
permissionSqlStr = strings.TrimRight(permissionSqlStr, ",")
|
|
|
+ permissionSqlStr = strings.Replace(permissionSqlStr, "(主观)", "", -1)
|
|
|
+ permissionSqlStr = strings.Replace(permissionSqlStr, "(客观)", "", -1)
|
|
|
permissionSqlStr = ` AND art.chart_permission_name IN (` + permissionSqlStr + `)`
|
|
|
sqlExport = ` AND (art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
|
|
|
if userType == 2 {
|
|
@@ -2160,6 +2164,8 @@ func (this *ActivityCoAntroller) LabelTypeList() {
|
|
|
permissionNameStr += "'" + v + "',"
|
|
|
}
|
|
|
}
|
|
|
+ permissionNameStr = strings.Replace(permissionNameStr, "(主观)", "", -1)
|
|
|
+ permissionNameStr = strings.Replace(permissionNameStr, "(客观)", "", -1)
|
|
|
permissionNameStr = strings.TrimRight(permissionNameStr, ",")
|
|
|
list, err := models.GetActivityTypeHomeList()
|
|
|
if err != nil {
|
|
@@ -2344,6 +2350,8 @@ func (this *ActivityCoAntroller) LabelMoreList() {
|
|
|
}
|
|
|
}
|
|
|
permissionSqlStr = strings.TrimRight(permissionSqlStr, ",")
|
|
|
+ permissionSqlStr = strings.Replace(permissionSqlStr, "(主观)", "", -1)
|
|
|
+ permissionSqlStr = strings.Replace(permissionSqlStr, "(客观)", "", -1)
|
|
|
permissionSqlStr = ` AND art.chart_permission_name IN (` + permissionSqlStr + `)`
|
|
|
sqlExport = ` AND (art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
|
|
|
if userType == 2 {
|
|
@@ -2500,6 +2508,8 @@ func (this *ActivityCoAntroller) ActivityListNew() {
|
|
|
}
|
|
|
}
|
|
|
permissionSqlStr = strings.TrimRight(permissionSqlStr, ",")
|
|
|
+ permissionSqlStr = strings.Replace(permissionSqlStr, "(主观)", "", -1)
|
|
|
+ permissionSqlStr = strings.Replace(permissionSqlStr, "(客观)", "", -1)
|
|
|
permissionSqlStr = ` AND art.chart_permission_name IN (` + permissionSqlStr + `)`
|
|
|
sqlExport = ` AND (art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
|
|
|
if userType == 2 {
|
|
@@ -2728,6 +2738,8 @@ func (this *ActivityCoAntroller) LabelTypeListPc() {
|
|
|
permissionNameStr += "'" + v + "',"
|
|
|
}
|
|
|
}
|
|
|
+ permissionNameStr = strings.Replace(permissionNameStr, "(主观)", "", -1)
|
|
|
+ permissionNameStr = strings.Replace(permissionNameStr, "(客观)", "", -1)
|
|
|
permissionNameStr = strings.TrimRight(permissionNameStr, ",")
|
|
|
list, err := models.GetActivityTypeHomeListPc()
|
|
|
if err != nil {
|