选择用户信息代码修改

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

@@ -1497,32 +1497,52 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                 String[] userIdArray = userIds.split(",");
                 for (int i = 0; i < userIdArray.length; i++) {
                     HpUser hpUser1 = this.get(userIdArray[i]);
-                    if (StringUtils.isNotBlank(hpUser1.getUnionid())) {
-                        hpUser.setUnionid(hpUser1.getUnionid());
-                    }
-                    if (StringUtils.isNotBlank(hpUser1.getWxOpenid())) {
-                        hpUser.setWxOpenid(hpUser1.getWxOpenid());
-                    }
-                    if (StringUtils.isNotBlank(hpUser1.getMinaOpenid())) {
-                        hpUser.setMinaOpenid(hpUser1.getMinaOpenid());
-                    }
-                }
-                for (int i = 0; i < userIdArray.length; i++) {
-                    HpUser hpUser1 = this.get(userIdArray[i]);
-                    if (StringUtils.isNotBlank(hpUser1.getAccessToken())) {
-                        hpUser.setAccessToken(hpUser1.getAccessToken());
-                    }
-                    if (hpUser1.getAccessTokenEndtime() != null) {
-                        hpUser.setAccessTokenEndtime(hpUser1.getAccessTokenEndtime());
-                    }
-                    if (StringUtils.isNotBlank(hpUser1.getRefreshToken())) {
-                        hpUser.setRefreshToken(hpUser1.getRefreshToken());
-                    }
-                }
-                for (int i = 0; i < userIdArray.length; i++) {
-                    HpUser hpUser1 = this.get(userIdArray[i]);
-                    if (StringUtils.isNotBlank(hpUser1.getMinaSessionKey())) {
-                        hpUser.setMinaSessionKey(hpUser1.getMinaSessionKey());
+                    if ((StringUtils.isNotBlank(hpUser.getMinaOpenid()) && StringUtils.isNotBlank(hpUser1.getMinaOpenid())) ||
+                            (StringUtils.isNotBlank(hpUser.getWxOpenid()) && StringUtils.isNotBlank(hpUser1.getWxOpenid()))) {
+                        //替换手机号的情况合并数据
+                        if (StringUtils.isNotBlank(hpUser1.getUnionid())) {
+                            hpUser.setUnionid(hpUser1.getUnionid());
+                        }
+                        if (StringUtils.isNotBlank(hpUser1.getWxOpenid())) {
+                            hpUser.setWxOpenid(hpUser1.getWxOpenid());
+                        }
+                        if (StringUtils.isNotBlank(hpUser1.getMinaOpenid())) {
+                            hpUser.setMinaOpenid(hpUser1.getMinaOpenid());
+                        }
+                        if (StringUtils.isNotBlank(hpUser1.getAccessToken())) {
+                            hpUser.setAccessToken(hpUser1.getAccessToken());
+                        }
+                        if (hpUser1.getAccessTokenEndtime() != null) {
+                            hpUser.setAccessTokenEndtime(hpUser1.getAccessTokenEndtime());
+                        }
+                        if (StringUtils.isNotBlank(hpUser1.getRefreshToken())) {
+                            hpUser.setRefreshToken(hpUser1.getRefreshToken());
+                        }
+                        if (StringUtils.isNotBlank(hpUser1.getMinaSessionKey())) {
+                            hpUser.setMinaSessionKey(hpUser1.getMinaSessionKey());
+                        }
+                    } else {
+                        if (StringUtils.isBlank(hpUser.getUnionid())) {
+                            hpUser.setUnionid(hpUser1.getUnionid());
+                        }
+                        if (StringUtils.isBlank(hpUser.getWxOpenid())) {
+                            hpUser.setWxOpenid(hpUser1.getWxOpenid());
+                        }
+                        if (StringUtils.isBlank(hpUser.getMinaOpenid())) {
+                            hpUser.setMinaOpenid(hpUser1.getMinaOpenid());
+                        }
+                        if (StringUtils.isBlank(hpUser.getAccessToken())) {
+                            hpUser.setAccessToken(hpUser1.getAccessToken());
+                        }
+                        if (hpUser.getAccessTokenEndtime() == null) {
+                            hpUser.setAccessTokenEndtime(hpUser1.getAccessTokenEndtime());
+                        }
+                        if (StringUtils.isBlank(hpUser.getRefreshToken())) {
+                            hpUser.setRefreshToken(hpUser1.getRefreshToken());
+                        }
+                        if (StringUtils.isBlank(hpUser.getMinaSessionKey())) {
+                            hpUser.setMinaSessionKey(hpUser1.getMinaSessionKey());
+                        }
                     }
                 }
             }