From 5fa6e6f8410ef9d057174bcff2a3c5038c54a551 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期日, 27 四月 2025 18:41:20 +0800 Subject: [PATCH] bug修改 --- ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml index 8a93872..7a03ea8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml @@ -5,20 +5,37 @@ <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TItem"> <id column="id" property="id" /> - <result column="typeId" property="typeId" /> - <result column="itemName" property="itemName" /> - <result column="sortBy" property="sortBy" /> + <result column="type_id" property="typeId" /> + <result column="item_name" property="itemName" /> + <result column="sort_by" property="sortBy" /> <result column="pictures" property="pictures" /> - <result column="createTime" property="createTime" /> - <result column="updateTime" property="updateTime" /> - <result column="createBy" property="createBy" /> - <result column="updateBy" property="updateBy" /> - <result column="isDelete" property="isDelete" /> + <result column="create_time" property="createTime" /> + <result column="update_time" property="updateTime" /> + <result column="create_by" property="createBy" /> + <result column="update_by" property="updateBy" /> + <result column="disabled" property="disabled" /> </resultMap> <!-- 通用查询结果列 --> <sql id="Base_Column_List"> - id, typeId, itemName, sortBy, pictures, createTime, updateTime, createBy, updateBy, isDelete + id, type_id, item_name, sort_by, pictures, create_time, update_time, create_by, update_by, disabled </sql> + <select id="pageList" resultType="com.ruoyi.system.vo.TItemVO"> + select + t.id, t.type_id, t.item_name, t.sort_by, t.pictures, t.create_time, t.update_time, t.create_by, t.update_by, t.disabled, + tt.type_name + from t_item t + left join t_item_type tt on t.type_id = tt.id + <where> + <if test="query.itemName != null and query.itemName != ''"> + and t.item_name like concat('%', #{query.itemName}, '%') + </if> + <if test="query.typeId != null and query.typeId != ''"> + and t.type_id = #{query.typeId} + </if> + and t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} + </where> + order by t.sort_by, t.create_time desc + </select> </mapper> -- Gitblit v1.7.1