Merge remote-tracking branch 'origin/yb/1.1'

models/tables/company_report_permission/custom_query.go

@@ -1,7 +1,6 @@
 package company_report_permission
 
 import (
-	"fmt"
 	"hongze/hongze_yb/global"
 	"strings"
 	"time"
@@ -64,12 +63,12 @@ func GetResearchReportType(researchReportId, userId uint64, reportType string) (
 			return
 		}
 		if len(reportChapterTypeList) > 0 {
-			reportChapterTypeIdList := make([]string, 0)
+			reportChapterTypeIdList := make([]uint64, 0)
 			for _, v := range reportChapterTypeList {
-				reportChapterTypeIdList = append(reportChapterTypeIdList, fmt.Sprint(v.ReportChapterTypeId))
+				reportChapterTypeIdList = append(reportChapterTypeIdList, v.ReportChapterTypeId)
 			}
 			condition += ` and rct.report_chapter_type_id in (?) `
-			whereVals = append(whereVals, strings.Join(reportChapterTypeIdList, ","))
+			whereVals = append(whereVals, reportChapterTypeIdList)
 
 		}
 	}