还原

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/ClientAuthenticationResource.java

@@ -63,11 +63,11 @@ public class ClientAuthenticationResource
     public ResponseEntity<AuthenticationInfo> login(@Validated @RequestBody AuthorizationLogin authorizationLogin){
         userDetailsService.resetByUsername(authorizationLogin.getUsername());
         AuthenticationUser user = userDetailsService.loadUserByLogin(authorizationLogin.getUsername(),authorizationLogin.getPassword());
-//        if(user.getPermissionList()==null)
-//        {
-//            setUserPermission(user);
-//            setUserOrgInfo(user);
-//        }
+        if(user.getPermissionList()==null)
+        {
+            setUserPermission(user);
+            setUserOrgInfo(user);
+        }
         final String token = jwtTokenUtil.generateToken(user);
         // 返回 token
         return ResponseEntity.ok().body(new AuthenticationInfo(token,user));
@@ -77,11 +77,11 @@ public class ClientAuthenticationResource
     public ResponseEntity<AuthenticationUser> uaalogin(@Validated @RequestBody AuthorizationLogin authorizationLogin){
         userDetailsService.resetByUsername(authorizationLogin.getUsername());
         AuthenticationUser user = userDetailsService.loadUserByLogin(authorizationLogin.getUsername(),authorizationLogin.getPassword());
-//        if(user.getPermissionList()==null)
-//        {
-//            setUserPermission(user);
-//            setUserOrgInfo(user);
-//        }
+        if(user.getPermissionList()==null)
+        {
+            setUserPermission(user);
+            setUserOrgInfo(user);
+        }
         return ResponseEntity.ok().body(user);
     }