Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/HaiKangDoorService.java

@@ -644,11 +644,20 @@ public class HaiKangDoorService {
         labHaikangUser.setJoinUserId(userId);
         List<LabHaikangUser> userList = labHaikangUserMapper.queryAll(labHaikangUser);
 
-        for (LabWhiteJoinSublist labWhiteJoinSublist : labWhiteJoinSubList) {
-            for (LabHaikangUser haikangUser : userList) {
-                if(haikangUser.getSubId().equals(labWhiteJoinSublist.getSubjectId())){
-                    userList.remove(haikangUser);
-                    labWhiteJoinSubList.remove(labWhiteJoinSublist);
+
+        for (int i = 0; i < labWhiteJoinSubList.size(); i++) {
+
+            boolean isdel = false;
+            for (int j = 0; j < userList.size(); j++) {
+
+                if(userList.get(j).getSubId().equals(labWhiteJoinSubList.get(i).getSubjectId())){
+                    userList.remove(userList.get(j));
+                    j--;
+                    if(!isdel){
+                        labWhiteJoinSubList.remove(labWhiteJoinSubList.get(i));
+                        i--;
+                        isdel = true;
+                    }
                 }
                 if(userList.size() == 0){
                     break;