Browse Source

Merge branch 'feature/eta2.5.9_inspection_stat' into debug

xyxie 4 days ago
parent
commit
3dec3be620
1 changed files with 1 additions and 1 deletions
  1. 1 1
      models/data_manage/edb_inspection/edb_inspection_config.go

+ 1 - 1
models/data_manage/edb_inspection/edb_inspection_config.go

@@ -104,7 +104,7 @@ func GetListBySource(source int) (list []*EdbInspectionConfig, err error) {
 
 // 获取所有启用的配置项
 func GetAllEnabledConfigs() (list []*EdbInspectionConfigList, err error) {
-	sql := `SELECT c.*, t.name AS terminal_name FROM edb_inspection_config c left join edb_terminal t on c.terminal_code = t.terminal_code WHERE c.status = 1 ORDER BY c.modify_time DESC`
+	sql := `SELECT c.*, t.name AS terminal_name FROM edb_inspection_config c left join edb_terminal t on c.terminal_code = t.terminal_code WHERE c.status = 1 and t.status = 1 ORDER BY c.modify_time DESC`
 	err = global.DbMap[utils.DbNameIndex].Raw(sql).Find(&list).Error
 	return
 }