From 2649be9534e68592660ecd4d03f14edcdc9b5c45 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 04 Jan 2022 11:36:32 +0800
Subject: [PATCH] 考试成绩查询修改,保安员学历情况分布统计

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |    7 ++++++-
 1 files changed, 6 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 b9b5e75..e266d6a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -129,6 +129,9 @@
         <if test="user.status!=null and user.status != '' and user.status != 6">
             and bu.status = #{user.status}
         </if>
+        <if test="user.education!=null  and user.education != ''">
+            and bu.education = #{user.education}
+        </if>
         <if test="user.trainingUnitId!=null and user.trainingUnitId != ''">
             and str.training_unit_id = #{user.trainingUnitId}
         </if>
@@ -476,7 +479,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
@@ -893,4 +896,6 @@
         </foreach>
     </insert>
 
+
+
 </mapper>

--
Gitblit v1.9.3