From 4fa826960b4a4d758733715a19ce0d2abdf77ba7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 31 Dec 2021 18:25:35 +0800
Subject: [PATCH] 新增学历统计接口

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   11 +++++++++--
 1 files changed, 9 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 843cde7..b028bd7 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -170,7 +170,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>
 
     <select id="selectUserPage" resultMap="userResultMap">
@@ -471,7 +476,7 @@
 
     <!--计算保安人员年龄-->
     <select id="getUserAgeById" resultType="org.springblade.modules.system.vo.UserVO">
-        select id,ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(cardid,7,4),0) age,securitynumber,cardid
+        select id,real_name realName,ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(cardid,7,4),0) age,securitynumber,cardid
         from
         blade_user
         where
@@ -888,4 +893,6 @@
         </foreach>
     </insert>
 
+
+
 </mapper>

--
Gitblit v1.9.3