|
@@ -423,7 +423,7 @@ func FilterReportIds(ids []int) (total int64, reportIds []int, err error) {
|
|
|
subQuery := `
|
|
|
select a.classify_id
|
|
|
from (
|
|
|
- select classify_id, GROUP_CONCAT(permissions.risk_level SEPARATOR ',') as risks
|
|
|
+ select classify_id, IFNULL( GROUP_CONCAT(permissions.risk_level SEPARATOR ','),'') as risks
|
|
|
from permission_classify_mapping
|
|
|
left join permissions on permissions.permission_id = permission_classify_mapping.permission_id
|
|
|
group by classify_id
|
|
@@ -433,6 +433,7 @@ func FilterReportIds(ids []int) (total int64, reportIds []int, err error) {
|
|
|
err = db.Model(&Report{}).Select("id").
|
|
|
Where("id in ?", ids).
|
|
|
Where("classify_id not in (?)", gorm.Expr(subQuery)).
|
|
|
+ Where("Status = ?", StatusPublish).
|
|
|
Scan(&reportIds).Error
|
|
|
if err != nil {
|
|
|
logger.Error("查询过滤后的报告失败: %v", err)
|