From b6d477ad41e2a8ff9393de2beba2e735c78cf781 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期一, 22 七月 2024 18:06:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml index 18a9ccb..f0fd939 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml @@ -4,4 +4,12 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ycl.platform.mapper.TContractMapper"> -</mapper> \ No newline at end of file + <select id="selectAll" resultType="com.ycl.platform.domain.entity.TContract"> + select a.*, b.unit_name + from t_contract a + left join t_yw_unit b on a.unit_id = b.id and b.deleted = 0 + where a.deleted = 0 + order by create_time desc + </select> + +</mapper> -- Gitblit v1.8.0