From 2573f2327a2046ec8545e80e4e56d1ee6c55bfae Mon Sep 17 00:00:00 2001 From: zhangmei <645025773@qq.com> Date: 星期六, 08 二月 2025 13:39:41 +0800 Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into xizang-changyun --- ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml index 2bdea94..84d057e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml @@ -20,5 +20,22 @@ <sql id="Base_Column_List"> 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