소스 검색

Merge branch 'sandbox_classify_del' into debug

zwxi 1 년 전
부모
커밋
4adcad1a70
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      models/sandbox/sandbox_classify.go

+ 2 - 2
models/sandbox/sandbox_classify.go

@@ -122,8 +122,8 @@ func GetSandboxInfoCountByClassifyId(classifyId int) (count int, err error) {
 				FROM (SELECT * FROM sandbox_classify WHERE parent_id IS NOT NULL) rd,
 					 (SELECT @pid := ?) pd 
 				WHERE FIND_IN_SET(parent_id, @pid) > 0 
-				  AND @pid := CONCAT(@pid, ',', sandbox_classify_id) 
-				UNION SELECT * FROM sandbox_classify WHERE sandbox_classify_id = @pid
+				  AND @pid := CONCAT(@pid, ',', sandbox_classify_id) AND is_delete = 0 
+				UNION SELECT * FROM sandbox_classify WHERE sandbox_classify_id = @pid AND is_delete = 0 
 				)AS t
 				) `
 	err = o.Raw(sql, classifyId).QueryRow(&count)