From a139dba9262dbb4b70f34d3c2034c255561abcad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 26 七月 2025 18:04:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml
index f33c477..f89a07a 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml
@@ -69,9 +69,10 @@
</update>
<select id="getByAccount" resultType="user">
- select
- <include refid="Base_Column_List_With_Pwd" />
- from sys_user where account = #{account} and status != 3
+ select *
+ from sys_user
+ where account = #{account}
+ and status != 3
</select>
<!--根据角色判断菜单有"首页"的数量-->
@@ -103,6 +104,9 @@
<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
and (o.createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
</if>
+ <if test="null != objectId">
+ and o.objectId = #{objectId}
+ </if>
</where>
order by o.id desc
</select>
--
Gitblit v1.7.1