userInfo

userAuth

pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/model/UserFullInfoDTO.java

@@ -9,4 +9,20 @@ import lombok.Data;
 
 @Data
 public class UserFullInfoDTO {
+
+    private Long userId;
+
+    private String realName;
+
+    private String username;
+
+    private String identifier;
+
+    private String credential;
+
+    private String role;
+
+    private Long regionCode;
+
+    private Long companyId;
 }

pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/model/UserInfoDetails.java

@@ -9,7 +9,6 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
 import java.util.Collection;
-import java.util.List;
 
 /**
  * @author LiuXinXin
@@ -33,11 +32,6 @@ public class UserInfoDetails extends AbstractLoginUser implements UserDetails {
     private Long companyId;
 
     /**
-     * 所负责公司id列表
-     */
-    private List<Long> responsibleCompanyIdList;
-
-    /**
      * 获取用户权限
      *
      * @return

pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/password/PasswordLoginUserDetailService.java

@@ -29,15 +29,14 @@ public class PasswordLoginUserDetailService implements UserDetailsService {
             throw new UsernameNotFoundException(String.format("%s user not exist", username));
         }
         UserInfoDetails userInfoDetails = new UserInfoDetails();
-//        userInfoDetails.setUserId(userFullInfoDTO.getUserId());
-//        userInfoDetails.setUsername(userFullInfoDTO.getUsername());
-//        userInfoDetails.setRealName(userFullInfoDTO.getRealName());
-//        userInfoDetails.setRole(userFullInfoDTO.getRole());
-//        userInfoDetails.setRegionCode(userFullInfoDTO.getRegionCode());
-//        userInfoDetails.setCompanyId(userFullInfoDTO.getCompanyId());
-//        userInfoDetails.setResponsibleCompanyIdList(userFullInfoDTO.getResponsibleCompanyIdList());
-//        userInfoDetails.setIdentifier(userFullInfoDTO.getIdentifier());
-//        userInfoDetails.setPassword(userFullInfoDTO.getCredential());
+        userInfoDetails.setUserId(userFullInfoDTO.getUserId());
+        userInfoDetails.setUsername(userFullInfoDTO.getUsername());
+        userInfoDetails.setRealName(userFullInfoDTO.getRealName());
+        userInfoDetails.setRole(userFullInfoDTO.getRole());
+        userInfoDetails.setRegionCode(userFullInfoDTO.getRegionCode());
+        userInfoDetails.setCompanyId(userFullInfoDTO.getCompanyId());
+        userInfoDetails.setIdentifier(userFullInfoDTO.getIdentifier());
+        userInfoDetails.setPassword(userFullInfoDTO.getCredential());
         return userInfoDetails;
     }
 }