Merge branch 'ETA_1.1.5' into debug

controllers/sandbox/sandbox.go

@@ -1396,6 +1396,7 @@ func (this *SandboxController) ListV2() {
 	}
 
 	//获取图表信息
+	condition += ` AND is_delete = 0 `
 	list, err := sandbox.GetSandboxListByCondition(condition, pars, startSize, pageSize)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Success = true

models/sandbox/sandbox.go

@@ -303,7 +303,7 @@ func AddSandbox(item *Sandbox) (lastId int64, err error) {
 func GetSandboxItemsByClassifyId(sandboxClassifyId int) (list []*SandboxClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT sandbox_id,sandbox_classify_id,name AS sandbox_classify_name, sort
-		FROM sandbox  WHERE sandbox_classify_id = ?`
+		FROM sandbox  WHERE sandbox_classify_id = ? AND is_delete = 0 `
 	_, err = o.Raw(sql,sandboxClassifyId).QueryRows(&list)
 	return
 }