From a2128bbba47602e6795f2667cf2948992f24bebe Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 10 Jan 2022 17:00:22 +0800
Subject: [PATCH] 1. 上岗证新增审核 2. 上岗证导出和证书打印记录时间

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |    5 ++++-
 1 files changed, 4 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 a34edf2..a4e360f 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -55,6 +55,7 @@
         select
         distinct
         bu.*,IF(mod(SUBSTR(bu.cardid,17,1),2),1,2) sexs,
+        ifnull(TIMESTAMPDIFF(YEAR, SUBSTRING(bu.cardid, 7, 8), CURDATE()),0) AS age,
         sll.longitude,sll.latitude,
         bd.dept_name
         from
@@ -567,7 +568,7 @@
             from (
                 select
                     distinct
-                    bu.id
+                    bu.id,
                     ifnull(TIMESTAMPDIFF(YEAR, SUBSTRING(bu.cardid, 7, 8), CURDATE()),0) AS age,
                     bu.is_apply isApply,
                     bu.is_train isTrain,
@@ -656,6 +657,8 @@
          on
          bu.dept_id = bd.id
         where securitynumber = #{securityNumber}
+        and bu.status = 1
+        and bu.is_deleted = 0
     </select>
 
 

--
Gitblit v1.9.3