lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-10-21 11:27:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复登录用户能搜索的私有项目的BUG

Browse Source
This commit is contained in:
Minho
2017-05-05 15:04:31 +08:00
parent da2dbf7146
commit 906191624c
7 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
models/document_search_result.go
View File

@@ -55,21 +55,23 @@ WHERE book.privately_owned = 0 AND (doc.document_name LIKE ? OR doc.release LIKE
sql1 := `SELECT count(doc.document_id) as total_count FROM md_documents AS doc
LEFT JOIN md_books as book ON doc.book_id = book.book_id
LEFT JOIN md_relationship AS rel ON doc.book_id = rel.book_id AND role_id = 0
WHERE (book.privately_owned = 0 OR rel.relationship_id > 0) AND (doc.document_name LIKE ? OR doc.release LIKE ?) `
LEFT JOIN md_relationship AS rel1 ON doc.book_id = rel1.book_id AND rel1.member_id = ?
WHERE (book.privately_owned = 0 OR rel1.relationship_id > 0) AND (doc.document_name LIKE ? OR doc.release LIKE ?) `
sql2 := `SELECT doc.document_id,doc.modify_time,doc.create_time,doc.document_name,doc.identify,doc.release as description,doc.modify_time,book.identify as book_identify,book.book_name,rel.member_id,member.account AS author FROM md_documents AS doc
LEFT JOIN md_books as book ON doc.book_id = book.book_id
LEFT JOIN md_relationship AS rel ON book.book_id = rel.book_id AND role_id = 0
LEFT JOIN md_members as member ON rel.member_id = member.member_id
WHERE (book.privately_owned = 0 OR rel.relationship_id > 0) AND (doc.document_name LIKE ? OR doc.release LIKE ?)
LEFT JOIN md_relationship AS rel1 ON doc.book_id = rel1.book_id AND rel1.member_id = ?
WHERE (book.privately_owned = 0 OR rel1.relationship_id > 0) AND (doc.document_name LIKE ? OR doc.release LIKE ?)
ORDER BY doc.document_id DESC LIMIT ?,? `
err = o.Raw(sql1,keyword,keyword).QueryRow(&total_count)
err = o.Raw(sql1,member_id,keyword,keyword).QueryRow(&total_count)
if err != nil{
return
}
_,err = o.Raw(sql2,keyword,keyword,offset,page_size).QueryRows(&search_result)
_,err = o.Raw(sql2,member_id,keyword,keyword,offset,page_size).QueryRows(&search_result)
if err != nil {
return
}