1.注册、登录、切换身份

hmit-api/src/main/java/io/hmit/service/impl/UserServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implements UserService {
@@ -99,6 +100,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         map.put("token", tokenEntity.getToken());
         map.put("expire", tokenEntity.getExpireDate().getTime() - System.currentTimeMillis());
         List<UserRoleInfoDTO> roles = userDao.getUserRoleInfo(user.getId());
+        roles = roles.stream().distinct().collect(Collectors.toList());
         map.put("roles", roles);
 
         return map;
@@ -134,6 +136,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     @Override
     public void registerUser(UserRegisterDTO dto) {
+        UserEntity reRegister = getByOpenId(dto.getOpenid());
+        if (null != reRegister) {
+            reRegister.setOpenid("");
+            updateById(reRegister);
+        }
         UserRegisterDTO userRegisterDTO = getUserInfoByIdCardNo(dto.getIdCardNo());
         UserEntity userEntity;
         if (null != userRegisterDTO) {