From 1734f2d56162a1fdb556632dc36fcef0ca57851c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 16 十二月 2024 11:38:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/resources/mapping/TLensSeriesMapper.xml | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/manage/src/main/resources/mapping/TLensSeriesMapper.xml b/manage/src/main/resources/mapping/TLensSeriesMapper.xml
index 6022bd2..d3e737c 100644
--- a/manage/src/main/resources/mapping/TLensSeriesMapper.xml
+++ b/manage/src/main/resources/mapping/TLensSeriesMapper.xml
@@ -17,11 +17,29 @@
<result column="createBy" property="createBy" />
<result column="updateBy" property="updateBy" />
<result column="isDelete" property="isDelete" />
+ <result column="status" property="status" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, name, brandId, supplierId, type, sphere, asphericSurface, doubleNon, createTime, updateTime, createBy, updateBy, isDelete
</sql>
+ <select id="pageList" resultType="com.jilongda.manage.vo.TLensSeriesVO">
+ select t1.*,t2.name as brandName
+ from t_lens_series t1
+ left join t_brand t2 on t1.brandId = t2.id
+ where 1=1
+ <if test="query.brandId != null and query.brandId != ''">
+ and t1.brandId = #{query.brandId}
+ </if>
+ <if test="query.type != null and query.type != ''">
+ and t1.type = #{query.type}
+ </if>
+ and t2.type = 2
+ and t2.status = 1
+ and t1.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ and t2.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ order by t1.id asc
+ </select>
</mapper>
--
Gitblit v1.7.1