|
@@ -487,11 +487,11 @@ func (this *PptV2Controller) AuthList() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- // 查询自己创建的以及协作人包含自己的报告
|
|
|
+ // 查询自己创建的以及协作人包含自己的报告、以及外部已审批报告
|
|
|
var cond string
|
|
|
var pars []interface{}
|
|
|
- cond += ` AND (admin_id = ? OR (admin_id <> ? AND FIND_IN_SET(?, collaborate_users)))`
|
|
|
- pars = append(pars, sysUser.AdminId, sysUser.AdminId, sysUser.AdminId)
|
|
|
+ cond += ` AND (admin_id = ? OR (admin_id <> ? AND FIND_IN_SET(?, collaborate_users)) OR (report_source = ? AND state = ?))`
|
|
|
+ pars = append(pars, sysUser.AdminId, sysUser.AdminId, sysUser.AdminId, utils.ReportSourceOuter, models.ReportStatePass)
|
|
|
if classifyId > 0 {
|
|
|
cond += ` AND classify_id = ? `
|
|
|
pars = append(pars, classifyId)
|