浏览代码

Merge branch 'hotfix/bug7340_ppt_list' of eta_gn_server/eta_api into master

xyxie 1 天之前
父节点
当前提交
4795a6ce6f
共有 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)