Преглед изворни кода

Merge branch 'hotfix/bug7340_ppt_list' into debug

xyxie пре 1 недеља
родитељ
комит
af40511a53
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      controllers/ppt_report.go

+ 2 - 2
controllers/ppt_report.go

@@ -50,8 +50,8 @@ func (this *PptV2Controller) ReportClassify() {
 			cond += ` AND admin_id = ?`
 			pars = append(pars, sysUser.AdminId)
 		case 2:
-			cond += ` AND collaborate_type = ? AND (admin_id = ? OR FIND_IN_SET(?, collaborate_users)) `
-			pars = append(pars, utils.ReportWriteTypeGroup, sysUser.AdminId)
+			cond += ` AND collaborate_type = ? AND (admin_id = ? OR (collaborate_users IS NOT NULL AND INSTR(','||collaborate_users||',', ','||?||',') > 0)) `
+			pars = append(pars, utils.ReportWriteTypeGroup, sysUser.AdminId, sysUser.AdminId)
 		case 3:
 			cond += ` AND report_source = ? AND state = ?`
 			pars = append(pars, utils.ReportSourceOuter, models.ReportStatePass)