判定是否需要选中用户信息的时候，增加list长度！=0的判断，否则会出现0=0的情况

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

@@ -1137,7 +1137,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                 hpUser1 = hpUserList.get(0);
             }
             //如果数据list大小相同，则存在重复
-            if (list.size() == hpUserList.size()) {
+            if (list.size() == hpUserList.size() && list.size() != 0) {
                 returnMap.put("userList", list);
                 returnMap.put("success", "2009");
                 return returnMap;
@@ -1542,7 +1542,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                     hpUser.setRefreshToken(refreshToken);
                     hpUser.setAccessTokenEndtime(access_token_endtime);
                     this.save(hpUser);
-                    if (list2.size() == hpUserList.size()) {
+                    if (list2.size() == hpUserList.size() && list2.size() != 0) {
                         returnMap.put("userList", list2);
                         returnMap.put("success", "2009");
                         return returnMap;
@@ -1629,7 +1629,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                 if (hpMemberList != null && hpMemberList.size() > 0) {
                     userIds = hpUser.getId();//此登录的微信用户自动被遗弃
                     //该手机号存在于member表中，以此用户为唯一
-                    hpUser = hpMemberList.get(0).getHpUser();
+                    hpUser = this.get(hpMemberList.get(0).getHpUser().getId());
                     //进行数据合并
                     hpUser = upDateHpUser(hpUser, userIds, "1");
                     //逻辑删除掉当前登录的用户
@@ -1797,7 +1797,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
             hpUser.setRefreshToken(refreshToken);
             hpUser.setAccessTokenEndtime(access_token_endtime);
             this.save(hpUser);
-            if (list2.size() == hpUserList.size()) {
+            if (list2.size() == hpUserList.size() && list2.size() != 0) {
                 returnMap.put("userList", list2);
                 returnMap.put("success", "2009");
                 return returnMap;
@@ -2079,7 +2079,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                         hpUser1.setCity(city);
                         hpUser1.setLoginTime(new Date());
                         this.save(hpUser1);
-                        if (list2.size() == hpUserList.size()) {
+                        if (list2.size() == hpUserList.size() && list2.size() != 0) {
                             returnMap.put("userList", list2);
                             returnMap.put("success", "2009");
                             return returnMap;
@@ -2157,7 +2157,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                 if (hpMemberList != null && hpMemberList.size() > 0) {
                     userIds = hpUser.getId();//此登录的微信用户自动被遗弃
                     //该手机号存在于member表中，以此用户为唯一
-                    hpUser = hpMemberList.get(0).getHpUser();
+                    hpUser = this.get(hpMemberList.get(0).getHpUser().getId());
                     //进行数据合并
                     hpUser = upDateHpUser(hpUser, userIds, "1");
                     //逻辑删除掉当前登录的用户
@@ -2316,7 +2316,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
             hpUser.setCoutry(country);
             hpUser.setMinaSessionKey(sessionKey);
             this.save(hpUser);
-            if (list2.size() == hpUserList.size()) {
+            if (list2.size() == hpUserList.size() && list2.size() != 0) {
                 returnMap.put("userList", list2);
                 returnMap.put("success", "2009");
                 return returnMap;