瀏覽代碼

Merge branch 'ETA_1.1.5' into debug

ziwen 1 年之前
父節點
當前提交
97f97600be
共有 1 個文件被更改,包括 5 次插入3 次删除
  1. 5 3
      models/sandbox/sand_box_classify.go

+ 5 - 3
models/sandbox/sand_box_classify.go

@@ -201,7 +201,8 @@ func GetSandboxClassifyAndInfoByParentId(parentId int) (items []*SandboxClassify
 	sys_user_id,
 	sys_user_real_name AS sys_user_name,
 	sort,
-	level 
+	level,
+	0 AS is_delete
 FROM
 	sandbox_classify 
 WHERE
@@ -216,11 +217,12 @@ SELECT
 	sys_user_id,
 	sys_user_name,
 	sort,
-	0 AS level 
+	0 AS level,
+	is_delete 
 FROM
 	sandbox 
 WHERE
-	sandbox_classify_id = ? AND is_deleted = 0
+	sandbox_classify_id = ? AND is_delete = 0
 ORDER BY
 	sort ASC,
 	sandbox_classify_id ASC`