From fdf5990086e5e589d09ced712709db1e7f4387b0 Mon Sep 17 00:00:00 2001
From: "zhiyong.ning" <354350178@qq.com>
Date: Thu, 11 Mar 2021 14:20:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/msdw/tms/entity/vo/StudentVo.java | 2 ++
 src/main/resources/mapper/tms/StudentDao.xml        | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/msdw/tms/entity/vo/StudentVo.java b/src/main/java/com/msdw/tms/entity/vo/StudentVo.java
index 648238d..e1daa44 100644
--- a/src/main/java/com/msdw/tms/entity/vo/StudentVo.java
+++ b/src/main/java/com/msdw/tms/entity/vo/StudentVo.java
@@ -40,6 +40,8 @@ public class StudentVo extends StudentEntity {
     private String schoolAppellationName;
     //绑定所属院校id
     private Integer schoolAppellationId;
+    //学生学号
+    private String workNumber;
     //token
     private String token;
 }
diff --git a/src/main/resources/mapper/tms/StudentDao.xml b/src/main/resources/mapper/tms/StudentDao.xml
index a91bcac..e421705 100644
--- a/src/main/resources/mapper/tms/StudentDao.xml
+++ b/src/main/resources/mapper/tms/StudentDao.xml
@@ -29,8 +29,8 @@
 		u.disableAccount,
 		u.lastLoginTime,
 		s.roleId,
-		s.workNumber,
-		s.isdel	,
+		s.workNumber as workNumber,
+		s.isdel,
 		s.studentId
 		FROM
 		hr_user_info u,
@@ -43,7 +43,7 @@
 		AND u.isdel = 0
 		AND l.isdel = 0
 		AND s.isdel = 0
-		<if test="searchContent!=null">AND (u.account LIKE CONCAT('%',#{searchContent},'%') OR u.userName LIKE CONCAT('%',#{searchContent},'%') OR s.workNumber LIKE CONCAT('%',#{searchContent},'%'))</if>
+		<if test="searchContent!=null">AND (l.schoolName LIKE CONCAT('%',#{searchContent},'%') OR u.userName LIKE CONCAT('%',#{searchContent},'%'))</if>
 		ORDER BY studentId DESC
 	</select>