From 86e51e9199540ca5fe29b49d5fbe2f3476a0449d Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期二, 21 一月 2025 15:53:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml
index 24ecc4b..96f74cc 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml
@@ -22,11 +22,28 @@
<result column="create_by" property="createBy" />
<result column="update_by" property="updateBy" />
<result column="disabled" property="disabled" />
+ <result column="account" property="account" />
+ <result column="password" property="password" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, resident_name, checkIn_time, tenant_attributes, tenant_type, tenant_building, room_number, building_area, phone, id_card, email, bank_number, mail_address, create_time, update_time, create_by, update_by, disabled
+ id, resident_name, checkIn_time, tenant_attributes, tenant_type, tenant_building, room_number, building_area, phone, id_card, email,
+ bank_number, mail_address, create_time, update_time, create_by, update_by, disabled,account,password
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.model.TTenant">
+ SELECT <include refid="Base_Column_List"/>
+ FROM t_tenant
+ <where>
+ <if test="residentName != null and residentName != ''">
+ AND resident_name LIKE concat('%',#{residentName},'%')
+ </if>
+ <if test="phone != null and phone != ''">
+ AND phone LIKE concat('%',#{phone},'%')
+ </if>
+ AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY create_time DESC
+ </select>
</mapper>
--
Gitblit v1.7.1