xiatian 2 سال پیش
والد
کامیت
7782d080b2

+ 7 - 0
src/main/java/cn/com/qmth/mps/service/impl/AuthServiceImpl.java

@@ -26,6 +26,7 @@ import cn.com.qmth.mps.entity.WxappInfoEntity;
 import cn.com.qmth.mps.enums.Role;
 import cn.com.qmth.mps.exception.ParameterExceptions;
 import cn.com.qmth.mps.service.AuthService;
+import cn.com.qmth.mps.service.SchoolService;
 import cn.com.qmth.mps.service.SessionService;
 import cn.com.qmth.mps.service.UserService;
 import cn.com.qmth.mps.service.WxappAccessTokenService;
@@ -40,6 +41,8 @@ import sun.misc.BASE64Decoder;
 @AuthorizationComponent
 @Service
 public class AuthServiceImpl implements AuthorizationService<User>, AuthService {
+	@Autowired
+	private SchoolService schoolService;
 	@Autowired
 	private UserService userService;
 	@Autowired
@@ -83,6 +86,7 @@ public class AuthServiceImpl implements AuthorizationService<User>, AuthService
 		vo.setSessionId(user.getSessionId());
 		vo.setSchoolId(user.getSchoolId());
 		vo.setRole(user.getRole());
+		vo.setSchoolName(schoolService.getById(user.getSchoolId()).getName());
 		return vo;
 	}
 
@@ -117,6 +121,7 @@ public class AuthServiceImpl implements AuthorizationService<User>, AuthService
 		vo.setSessionId(user.getSessionId());
 		vo.setSchoolId(user.getSchoolId());
 		vo.setRole(user.getRole());
+		vo.setSchoolName(schoolService.getById(user.getSchoolId()).getName());
 		return vo;
 	}
 
@@ -202,6 +207,7 @@ public class AuthServiceImpl implements AuthorizationService<User>, AuthService
 		vo.setSessionId(user.getSessionId());
 		vo.setSchoolId(user.getSchoolId());
 		vo.setRole(user.getRole());
+		vo.setSchoolName(schoolService.getById(user.getSchoolId()).getName());
 		return vo;
 	}
 
@@ -305,6 +311,7 @@ public class AuthServiceImpl implements AuthorizationService<User>, AuthService
 		vo.setSessionId(user.getSessionId());
 		vo.setSchoolId(user.getSchoolId());
 		vo.setRole(user.getRole());
+		vo.setSchoolName(schoolService.getById(user.getSchoolId()).getName());
 		return vo;
 	}
 }

+ 10 - 0
src/main/java/cn/com/qmth/mps/vo/AdminLoginVo.java

@@ -6,6 +6,8 @@ import cn.com.qmth.mps.enums.Role;
 public class AdminLoginVo {
 	private Long schoolId;
 	
+	private String schoolName;
+	
 	private String name;
 
     private String sessionId;
@@ -62,6 +64,14 @@ public class AdminLoginVo {
 	public void setSchoolId(Long schoolId) {
 		this.schoolId = schoolId;
 	}
+
+	public String getSchoolName() {
+		return schoolName;
+	}
+
+	public void setSchoolName(String schoolName) {
+		this.schoolName = schoolName;
+	}
     
     
 }