// 分批

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointSubmitScheduleViewController.swift

@@ -179,6 +179,22 @@ class YHResignAppointSubmitScheduleViewController: YHBaseViewController {
             return
         }
         
+        // 先得到所有分批用户的集合
+        var allAppointUsers = [YHResignAppointUser]()
+        for group in scheduleArr {
+            allAppointUsers.append(contentsOf: group.user_list)
+        }
+        
+        // 过滤掉id重复的数据
+        var uniqueAllAppointUsers: [YHResignAppointUser] = []
+        var setIds = Set<Int>()
+        for model in allAppointUsers {
+            if !setIds.contains(model.id) {
+                setIds.insert(model.id)
+                uniqueAllAppointUsers.append(model)
+            }
+        }
+        
         // 多人多批
         var groupArr = [YHResignAppointTimeSettingModel]()
         for (index, group) in scheduleArr.enumerated() {
@@ -189,9 +205,23 @@ class YHResignAppointSubmitScheduleViewController: YHBaseViewController {
             model.leave_hk_at = group.leave_hk_at
             model.notleaveHK = group.leave_hk_at.isEmpty
             model.itemIndex = index
-            model.users = group.user_list.map {
-                return $0.transformToMember()
+            
+            // 先讲所有需分批用户设置为未选择状态
+            let users = uniqueAllAppointUsers.map {
+                let m = $0.transformToMember()
+                m.isSelected = false
+                return m
+            }
+            // 更新已选择状态
+            for selectUser in group.user_list {
+                for user in users {
+                    if user.id == selectUser.id {
+                        user.isSelected = true
+                        break
+                    }
+                }
             }
+            model.users = users
             groupArr.append(model)
         }