Explorar el Código

AccountDTO增加当前账户绑定的教师姓名

chenw hace 7 años
padre
commit
991a880906

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

@@ -16,6 +16,15 @@ public class AccountDTO implements Serializable {
     private String salt;
     private List<RoleDTO> roleMaps;
     private Long school_id;
+    private String username;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
 
     public Long getId() {
         return id;

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

@@ -51,6 +51,7 @@ public class AuthController {
             Long school_id = accountDTO.getRoleMaps().stream().filter(roleDTO -> "教师".equals(roleDTO.getRole_name())).findFirst().get().getSchool_id();
             accountDTO.setSchool_id(school_id);
             String realName = accountApi.getUsername(school_id, accountDTO.getId()).getData();
+            accountDTO.setUsername(realName);
             JwtInfo jwtInfo = new JwtInfo("school", school_id, accountDTO.getId(), StringUtils.isEmpty(realName) ? accountDTO.getUser_phone() : realName);
             JwtToken jwtToken = JwtHelper.generateToken(jwtInfo, privateKeyPath, expire);
             TokenDTO tokenDTO = BeanMapper.map(jwtToken, TokenDTO.class);