Browse Source

account增加school_id

chenw 7 years ago
parent
commit
c90f95030c

+ 9 - 0
base-servers/account/account-dto/src/main/java/com/usoftchina/smartschool/account/dto/AccountDTO.java

@@ -15,6 +15,7 @@ public class AccountDTO implements Serializable {
     private String user_code;
     private String salt;
     private List<RoleDTO> roleMaps;
+    private Long school_id;
 
     public Long getId() {
         return id;
@@ -55,4 +56,12 @@ public class AccountDTO implements Serializable {
     public void setRoleMaps(List<RoleDTO> roleMaps) {
         this.roleMaps = roleMaps;
     }
+
+    public Long getSchool_id() {
+        return school_id;
+    }
+
+    public void setSchool_id(Long school_id) {
+        this.school_id = school_id;
+    }
 }

+ 1 - 0
base-servers/auth/auth-server/src/main/java/com/usoftchina/smartschool/auth/controller/AuthController.java

@@ -48,6 +48,7 @@ public class AuthController {
         if (result.isSuccess()){
             AccountDTO accountDTO = result.getData();
             Long school_id = accountDTO.getRoleMaps().stream().filter(roleDTO -> "教师".equals(roleDTO.getRole_name())).findFirst().get().getSchool_id();
+            accountDTO.setSchool_id(school_id);
             JwtInfo jwtInfo = new JwtInfo("school", school_id, accountDTO.getId(), accountDTO.getUser_phone());
             JwtToken jwtToken = JwtHelper.generateToken(jwtInfo, privateKeyPath, expire);
             TokenDTO tokenDTO = BeanMapper.map(jwtToken, TokenDTO.class);