From 8e8c3113eea4c29a6c5a23ca35c4d460e81f3465 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Thu, 24 Feb 2022 09:47:03 +0800
Subject: [PATCH] 暂停模拟考试后,继续考试修改,状态修改为考试中,题目查询按本次模拟考试题目排序,接口放行
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 228bc9c..85a849c 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -656,7 +656,14 @@
blade_dept bd
on
bu.dept_id = bd.id
- where securitynumber = #{securityNumber}
+ where
+ 1=1
+ <if test="securityNumber!=null and securityNumber!=''">
+ and securitynumber = #{securityNumber}
+ </if>
+ <if test="cardid!=null and cardid!=''">
+ and cardid = #{cardid}
+ </if>
and bu.status = 1
and bu.is_deleted = 0
</select>
@@ -985,7 +992,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的保安信息-->
--
Gitblit v1.9.3