Commit 6451fbea authored by Steven杜宇's avatar Steven杜宇

// 赴港选择

parent 9ebbd822
...@@ -505,7 +505,7 @@ extension YHCertificateAppointViewController { ...@@ -505,7 +505,7 @@ extension YHCertificateAppointViewController {
let nextGroupIndex = groupLevel+1 let nextGroupIndex = groupLevel+1
if 0 <= nextGroupIndex, nextGroupIndex < items2.count { if 0 <= nextGroupIndex, nextGroupIndex < items2.count {
for i in nextGroupIndex..<items2.count { for i in nextGroupIndex..<items2.count {
let item = items2[nextGroupIndex] let item = items2[i]
if var members = item.model?.arr { if var members = item.model?.arr {
// 下几批的组员中都要删除该人 // 下几批的组员中都要删除该人
members = members.filter { $0.id != currentMember.id } members = members.filter { $0.id != currentMember.id }
...@@ -513,20 +513,29 @@ extension YHCertificateAppointViewController { ...@@ -513,20 +513,29 @@ extension YHCertificateAppointViewController {
} }
} }
} }
}
// 检测下几层有无空数组,有则删除该批
if 0 <= nextGroupIndex, nextGroupIndex < items2.count { // 无论是选中还是反选 检测下面所有批次有无全未选数组,有则删除该批
for i in nextGroupIndex..<items2.count { let nextGroupIndex = groupLevel+1
let item = items2[nextGroupIndex] if 0 <= nextGroupIndex, nextGroupIndex < items2.count {
if var members = item.model?.arr, members.count == 0 { var i = nextGroupIndex
while i < items2.count {
let item = items2[i]
if let members = item.model?.arr {
let a = members.filter {
return $0.isSelected == true
}
// 数组中全未选
if a.count <= 0 {
items2.remove(at: i)
} else {
i += 1
} }
} }
} }
} }
refreshData() refreshData()
} }
} }
...@@ -346,10 +346,13 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource { ...@@ -346,10 +346,13 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
return return
} }
let vc = YHCertificateAppointViewController() if true {
vc.orderId = 151085 let vc = YHCertificateAppointViewController()
self.navigationController?.pushViewController(vc) vc.orderId = 151085
return self.navigationController?.pushViewController(vc)
return
}
let item: PersonalModuleItem = items[indexPath.row] let item: PersonalModuleItem = items[indexPath.row]
switch item.type { switch item.type {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment