diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java index 5126918c..54db5520 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java @@ -40,5 +40,9 @@ public interface CoreUserDao extends BaseMapper { * @param pwd 密码 * @return 用户信息 */ - Map getUserByUsernameAndPwd(String username, String pwd); + Map getUserByUsernameAndPwd(String username, String password); + + Map getTeacherByNo(String username); + + Map getStudentByNo(String username); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java index 7c7e5dc1..61cea616 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java @@ -253,4 +253,12 @@ public class CoreUserService extends CoreBaseService { public Map getUserByUsernameAndPwd(String username,String password){ return coreUserDao.getUserByUsernameAndPwd(username,password); } + + public Map getTeacherByNo(String username){ + return coreUserDao.getTeacherByNo(username); + } + + public Map getStudentByNo(String username){ + return coreUserDao.getStudentByNo(username); + } } diff --git a/admin-core/src/main/resources/sql/core/coreUser.md b/admin-core/src/main/resources/sql/core/coreUser.md index bb609356..45163b84 100644 --- a/admin-core/src/main/resources/sql/core/coreUser.md +++ b/admin-core/src/main/resources/sql/core/coreUser.md @@ -25,6 +25,19 @@ getSumLoginCount getUserByUsernameAndPwd === SELECT + core_user.CODE, + core_role.NAME + FROM + core_user + JOIN core_user_role ON core_user.ID = core_user_role.USER_ID + JOIN core_role ON core_user_role.ROLE_ID = core_role.ID + WHERE + core_user.CODE = #username# + AND PASSWORD = #password# + +getStudentByNo +=== + SELECT core_user.ID AS userId, core_user.NAME AS NAME, core_role.NAME AS roleName, @@ -47,5 +60,27 @@ getUserByUsernameAndPwd JOIN core_role ON core_user_role.ROLE_ID = core_role.ID WHERE core_user.CODE = #username# - AND PASSWORD = #pwd# - \ No newline at end of file + +getTeacherByNo +=== + SELECT + core_user.ID AS userId, + core_user.NAME AS NAME, + core_role.NAME AS roleName, + universities_colleges.universities_colleges_id AS schoolId, + university_system.university_system_id AS majorId, + university_system.university_system_name AS majorName, + universities_colleges.universities_colleges_name AS schoolName, + university_faculty.university_faculty_id AS collegeId, + university_faculty.university_faculty_name AS collegeName + FROM + core_user + JOIN teacher ON core_user.CODE = teacher.teacher_job_number + JOIN universities_colleges ON core_user.ORG_ID = universities_colleges.org_id + + JOIN university_faculty ON teacher.university_faculty_id = university_faculty.university_faculty_id + JOIN university_system ON teacher.university_system_id = university_system.university_system_id + JOIN core_user_role ON core_user_role.USER_ID = core_user.ID + JOIN core_role ON core_user_role.ROLE_ID = core_role.ID + WHERE + teacher.teacher_job_number = #username# \ No newline at end of file