From 24797ef3f03b3b59f9ddced9a7d4962a7efc413c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Nov 2021 09:05:09 +0800
Subject: [PATCH] 资格审查内网穿透

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 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 83cf1b4..3c355ba 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -29,6 +29,8 @@
         <result column="work_status" property="work_status"/>
         <result column="examination_type" property="examination_type"/>
         <result column="examination_mx" property="examination_mx"/>
+        <result column="audit_time" property="auditTime"/>
+        <result column="cardid" property="cardid"/>
         <result column="district" property="district"/>
     </resultMap>
     <resultMap id="userResultMaps" type="org.springblade.modules.system.vo.UsersVo">
@@ -60,6 +62,8 @@
         <result column="examination_type" property="examination_type"/>
         <result column="examination_mx" property="examination_mx"/>
         <result column="dept_name" property="deptName"/>
+        <result column="audit_time" property="auditTime"/>
+        <result column="cardid" property="cardid"/>
     </resultMap>
 
     <select id="selectUserPage" resultMap="userResultMap">
@@ -105,7 +109,7 @@
         blade_role br
         on
         s.role_id=br.id
-        where s.is_deleted = 0 and br.role_alias ='qfqkdw'
+        where s.is_deleted = 0
         <if test="user.account!=null and user.account != ''">
             and s.account = #{user.account}
         </if>
@@ -213,8 +217,7 @@
         on
         bu.role_id=br.id
         where
-        br.role_alias ='qfqkdw'
-        and bu.is_deleted=0
+        bu.is_deleted=0
         <if test="user.realName!=null and user.realName !=''">
             <bind name="realName" value="'%'+user.realName+'%'"/>
             and bu.real_name like #{realName}
@@ -325,4 +328,14 @@
         GROUP BY
             bu.district
     </select>
+
+
+    <!--查询用户数据,未审核的-->
+    <select id="getNotAuditAllUserList" resultType="org.springblade.modules.system.entity.User">
+        select id, cardid
+        from blade_user
+        where examination_type is null
+    </select>
+
+
 </mapper>

--
Gitblit v1.9.3