1

web/src/main/java/com/ibeetl/jlw/web/query/StudentLoginLogQuery.java

@@ -18,8 +18,8 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper=false)
 public class StudentLoginLogQuery extends PageParam {
 
-    @Query(name = "用户名", display = false)
+    @Query(name = "用户名/姓名", display = false)
-    private String name;
+    private String codeOrName;
 
     @Query(name = "所属院校", display = false)
     private Long universitiesCollegesId;

web/src/main/java/com/ibeetl/jlw/web/query/StudentUseLogQuery.java

@@ -18,8 +18,8 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper=false)
 public class StudentUseLogQuery extends PageParam {
 
-    @Query(name = "用户名", display = false)
+    @Query(name = "用户名/姓名", display = false)
-    private String name;
+    private String codeOrName;
 
     @Query(name = "所属院校", display = false)
     private Long universitiesCollegesId;

web/src/main/resources/sql/jlw/student.md

@@ -1532,8 +1532,8 @@ queryStudentLoginLogByCondition
       WHERE
       1
       and ta.user_id is not null
-      @if(!isEmpty(name)) {
+      @if(!isEmpty(codeOrName)) {
-      and tc.`name` like #'%'+name+'%'#
+      and concat(tc.`name`, tc.`code`) like #'%'+codeOrName+'%'#
       @}
       @if(!isEmpty(classId)) {
       and and t.class_id = #classId#
@@ -1629,8 +1629,8 @@ queryStudentUseLogByCondition
     1
     and ta.user_id is not null
     AND tb.application_name IS NOT NULL
-    @if(!isEmpty(name)) {
+    @if(!isEmpty(codeOrName)) {
-    and tc.`name` like #'%'+name+'%'#
+    and concat(tc.`name`, tc.`code`) like #'%'+codeOrName+'%'#
     @}
     @if(!isEmpty(classId)) {
     and and t.class_id = #classId#