From 95985b5a5bb7c5656098cc8923ed3d1d8aaa3d2b Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期五, 24 一月 2025 10:44:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml
index 96f74cc..ec45f48 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml
@@ -9,9 +9,6 @@
<result column="checkIn_time" property="checkinTime" />
<result column="tenant_attributes" property="tenantAttributes" />
<result column="tenant_type" property="tenantType" />
- <result column="tenant_building" property="tenantBuilding" />
- <result column="room_number" property="roomNumber" />
- <result column="building_area" property="buildingArea" />
<result column="phone" property="phone" />
<result column="id_card" property="idCard" />
<result column="email" property="email" />
@@ -28,18 +25,19 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, resident_name, checkIn_time, tenant_attributes, tenant_type, tenant_building, room_number, building_area, phone, id_card, email,
+ id, resident_name, checkIn_time, tenant_attributes, tenant_type, 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"/>
+ <select id="pageList" resultType="com.ruoyi.system.vo.TenantVO">
+ SELECT id, resident_name, checkIn_time, tenant_attributes, tenant_type, phone, id_card, email,
+ bank_number, mail_address, create_time, disabled,account,
FROM t_tenant
<where>
- <if test="residentName != null and residentName != ''">
- AND resident_name LIKE concat('%',#{residentName},'%')
+ <if test="query.residentName != null and query.residentName != ''">
+ AND resident_name LIKE concat('%',#{query.residentName},'%')
</if>
- <if test="phone != null and phone != ''">
- AND phone LIKE concat('%',#{phone},'%')
+ <if test="query.phone != null and query.phone != ''">
+ AND phone LIKE concat('%',#{query.phone},'%')
</if>
AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
--
Gitblit v1.7.1