From 0393a3b2b4d968b0423f0b81b0f7f8e6db75a016 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 04 Dec 2021 16:04:14 +0800
Subject: [PATCH] 1.首页现实表现
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 8 +++++++-
1 files changed, 7 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 2730e96..df7965a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.system.mapper.UserMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="userResultMap" type="org.springblade.modules.system.entity.User">
+ <resultMap id="userResultMap" type="org.springblade.modules.system.vo.UserVO">
<result column="id" property="id"/>
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
@@ -182,6 +182,12 @@
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
</if>
+ <if test="user.types!=null and user.types=='1'.toString()">
+ and to_days(bu.audit_time) = to_days(now())
+ </if>
+ <if test="user.types!=null and user.types=='2'.toString()">
+ and DATE_FORMAT(bu.audit_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+ </if>
<if test="user.jurisdiction!=null and user.jurisdiction!='' and user.jurisdiction!='1372091709474910209'">
and (j.id = #{user.jurisdiction} or j.parent_id = #{user.jurisdiction})
</if>
--
Gitblit v1.9.3