From a29a3c47478779fa650f12e4b1fe75441c395375 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 一月 2025 11:35:37 +0800
Subject: [PATCH] 租户房屋接口对接

---
 ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml |   13 +++++--------
 1 files changed, 5 insertions(+), 8 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..31b8911 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,18 @@
 
     <!-- 通用查询结果列 -->
     <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"/>
         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