用户自动合并时，废弃的id获取提前，防止获取到另外一条

src/main/java/com/jeeplus/modules/sys/service/HpUserService.java

@@ -1119,13 +1119,13 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                         if (i == 0) {
                             HpUser hpUserOth = hpUserList.get(1);
                             HpUser hpUserOld = hpUserList.get(0);
-                            hpUser1 = changeHpUserData(hpUserOth, hpUserOld);
                             userIds = hpUserOld.getId();
+                            hpUser1 = changeHpUserData(hpUserOth, hpUserOld);
                         } else {
                             HpUser hpUserOth = hpUserList.get(0);
                             HpUser hpUserOld = hpUserList.get(1);
-                            hpUser1 = changeHpUserData(hpUserOth, hpUserOld);
                             userIds = hpUserOld.getId();
+                            hpUser1 = changeHpUserData(hpUserOth, hpUserOld);
                         }
                         break;
                     } else {
@@ -1269,6 +1269,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
         HpResume hpResume = null;
         if (hpResumeList != null && hpResumeList.size() > 0) {
             hpResume = hpResumeList.get(0);
+            logger.info("getUserLists===================" + hpResume);
             List<HpResumeWorkExperience> hpResumeWorkExperienceList = hpResumeWorkExperienceService.findListByResumeId(hpResume.getId());
             hpResume.setHpResumeWorkExperienceList(hpResumeWorkExperienceList);
             if (StringUtils.isNotBlank(hpResume.getHeadImg())) {
@@ -1480,26 +1481,34 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                 if (StringUtils.isNotBlank(hpUser.getPhone())) {
                     //查询是否存在本条数据
                     List<HpUser> hpUserList = this.findByPhone_new(hpUser);
+                    logger.info("hpUserList===================" + hpUserList);
+                    logger.info("hpUserList===================" + hpUserList.size());
                     //如果该用户有多条记录，则提示选择一条用户，其余则遗弃不再使用
                     List list2 = new ArrayList();
                     if (hpUserList.size() > 1) {
                         for (int i = 0; i < hpUserList.size(); i++) {
                             Map map = getUserLists(hpUserList.get(i));
                             HpResume hpResume = (HpResume) map.get("hpResume");
+                            logger.info("hpResume===================" + hpResume);
                             //以简历是否存在作为判断该账号下是否存在数据的标准
                             if (hpResume == null) {
                                 //没有简历，该条用户记录自动被视为放弃，数据绑定到另外的用户上
                                 if (i == 0) {
                                     HpUser hpUserOth = hpUserList.get(1);
                                     HpUser hpUserOld = hpUserList.get(0);
-                                    hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                     userIds = hpUserOld.getId();
+                                    logger.info("hpUserOth=========" + hpUserOth);
+                                    logger.info("hpUserOld=========" + hpUserOld);
+                                    hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                 } else {
                                     HpUser hpUserOth = hpUserList.get(0);
                                     HpUser hpUserOld = hpUserList.get(1);
-                                    hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                     userIds = hpUserOld.getId();
+                                    logger.info("hpUserOth=========" + hpUserOth);
+                                    logger.info("hpUserOld=========" + hpUserOld);
+                                    hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                 }
+                                logger.info("hpUser=============" + hpUser);
                                 break;
                             } else {
                                 list2.add(map);
@@ -1549,6 +1558,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                     }
                     returnMap.put("hpUser", hpUser);
                     //判断member表是否存在该手机号用户
+                    logger.info("====================hpid==============" + hpUser.getId() + "ffffffffff===========" + userIds);
                     HpMember hpMember = checkMember(hpUser, hpUser.getPhone(), userIds);
                     returnMap.put("hpMember", hpMember);
                     //返回用户简历信息
@@ -1654,13 +1664,13 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                                     if (i == 0) {
                                         HpUser hpUserOth = hpUserList.get(1);
                                         HpUser hpUserOld = hpUserList.get(0);
-                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                         userIds = hpUserOld.getId();
+                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                     } else {
                                         HpUser hpUserOth = hpUserList.get(0);
                                         HpUser hpUserOld = hpUserList.get(1);
-                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                         userIds = hpUserOld.getId();
+                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                     }
                                     break;
                                 } else {
@@ -1713,13 +1723,13 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                                     if (i == 0) {
                                         HpUser hpUserOth = hpUserList.get(1);
                                         HpUser hpUserOld = hpUserList.get(0);
-                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                         userIds = hpUserOld.getId();
+                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                     } else {
                                         HpUser hpUserOth = hpUserList.get(0);
                                         HpUser hpUserOld = hpUserList.get(1);
-                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                         userIds = hpUserOld.getId();
+                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                     }
                                     break;
                                 } else {
@@ -2034,13 +2044,13 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                                     if (i == 0) {
                                         HpUser hpUserOth = hpUserList.get(1);
                                         HpUser hpUserOld = hpUserList.get(0);
-                                        hpUser1 = changeHpUserData(hpUserOth, hpUserOld);
                                         userIds = hpUserOld.getId();
+                                        hpUser1 = changeHpUserData(hpUserOth, hpUserOld);
                                     } else {
                                         HpUser hpUserOth = hpUserList.get(0);
                                         HpUser hpUserOld = hpUserList.get(1);
-                                        hpUser1 = changeHpUserData(hpUserOth, hpUserOld);
                                         userIds = hpUserOld.getId();
+                                        hpUser1 = changeHpUserData(hpUserOth, hpUserOld);
                                     }
                                     break;
                                 } else {
@@ -2182,13 +2192,13 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                                     if (i == 0) {
                                         HpUser hpUserOth = hpUserList.get(1);
                                         HpUser hpUserOld = hpUserList.get(0);
-                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                         userIds = hpUserOld.getId();
+                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                     } else {
                                         HpUser hpUserOth = hpUserList.get(0);
                                         HpUser hpUserOld = hpUserList.get(1);
-                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                         userIds = hpUserOld.getId();
+                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                     }
                                     break;
                                 } else {
@@ -2240,13 +2250,13 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                                     if (i == 0) {
                                         HpUser hpUserOth = hpUserList.get(1);
                                         HpUser hpUserOld = hpUserList.get(0);
-                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                         userIds = hpUserOld.getId();
+                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                     } else {
                                         HpUser hpUserOth = hpUserList.get(0);
                                         HpUser hpUserOld = hpUserList.get(1);
-                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                         userIds = hpUserOld.getId();
+                                        hpUser = changeHpUserData(hpUserOth, hpUserOld);
                                     }
                                     break;
                                 } else {