选择用户信息代码修改

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

@@ -1497,8 +1497,8 @@ 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(hpUser.getMinaOpenid()) && StringUtils.isNotBlank(hpUser1.getMinaOpenid())) ||
-                            (StringUtils.isNotBlank(hpUser.getWxOpenid()) && StringUtils.isNotBlank(hpUser1.getWxOpenid()))) {
+                    if ((StringUtils.isNotBlank(hpUser.getUnionid()) && StringUtils.isNotBlank(hpUser1.getUnionid())) &&
+                            (!hpUser.getUnionid().equals(hpUser1.getUnionid()))) {
                         //替换手机号的情况合并数据
                         if (StringUtils.isNotBlank(hpUser1.getUnionid())) {
                             hpUser.setUnionid(hpUser1.getUnionid());