|
@@ -546,13 +546,13 @@ class SecondTabViewController: UIViewController, UIScrollViewDelegate, UIGesture
|
|
|
|
|
|
private func getGroupRecursive(fmdb: FMDatabase, id: String = "", parent: String = "") -> [Group] {
|
|
private func getGroupRecursive(fmdb: FMDatabase, id: String = "", parent: String = "") -> [Group] {
|
|
var data: [Group] = []
|
|
var data: [Group] = []
|
|
- var query = "select g.group_id, g.f_name, g.image_id, g.quote, g.created_by, g.created_date, g.parent, g.group_type, g.is_open, g.official, g.is_education, g.level from GROUPZ g where "
|
|
|
|
|
|
+ var query = "select g.group_id, g.f_name, g.image_id, g.quote, g.created_by, g.created_date, g.parent, g.group_type, g.is_open, g.official, g.is_education, g.level, g.chat_modifier from GROUPZ g where "
|
|
if id.isEmpty {
|
|
if id.isEmpty {
|
|
query += "g.parent = '\(parent)'"
|
|
query += "g.parent = '\(parent)'"
|
|
} else {
|
|
} else {
|
|
query += "g.group_id = '\(id)'"
|
|
query += "g.group_id = '\(id)'"
|
|
}
|
|
}
|
|
- query += "order by 10 desc"
|
|
|
|
|
|
+ query += "order by 12 asc, 13 asc, 2 asc"
|
|
if let cursor = Database.shared.getRecords(fmdb: fmdb, query: query) {
|
|
if let cursor = Database.shared.getRecords(fmdb: fmdb, query: query) {
|
|
while cursor.next() {
|
|
while cursor.next() {
|
|
let group = Group(
|
|
let group = Group(
|