From ff13be9aaa95de8be5341e93e95f8611a43d4403 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 22 Jan 2022 11:04:11 +0800
Subject: [PATCH] 新增定时任务每天查询考试中的人员,进行成绩核算和修改状态

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 4bb1b0b..930341e 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -657,6 +657,8 @@
          on
          bu.dept_id = bd.id
         where securitynumber = #{securityNumber}
+        and bu.status = 1
+        and bu.is_deleted = 0
     </select>
 
 
@@ -983,7 +985,12 @@
         <if test="user.cardid!=null and user.cardid != ''">
             and bu.cardid like concat('%', #{user.cardid},'%')
         </if>
-        ORDER BY bu.id desc
+        <if test="user.sortName!=null and user.sortName!=''">
+            ORDER BY bu.${user.sortName} ${user.sort},bu.id desc
+        </if>
+        <if test="user.sortName==null or user.sortName==''">
+            ORDER BY bu.id desc
+        </if>
     </select>
 
     <!--查询押运人员编码不为null的保安信息-->
@@ -996,6 +1003,7 @@
           AND is_deleted = 0
           AND `status` = 1
           AND equipment_code IS NOT NULL
+          AND equipment_code!=""
     </select>
 
     <!--查詢用戶派遣記錄信息-->

--
Gitblit v1.9.3