From e5eb11a3a463c6c5ff86998649f2d13543403dc8 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 24 九月 2024 15:07:32 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml index c4fab1e..d1ee14b 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml @@ -116,7 +116,7 @@ <!--鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨祦娴帶鍒跺櫒淇℃伅--> <select id="getTrampControllerInfo" resultMap="BaseResultMap"> - SELECT rtuAddr, protocol, findDt FROM pr_controller_tramp WHERE id = ${controllerId} + SELECT rtuAddr, protocol, findDt, orgTag FROM pr_controller_tramp WHERE id = #{controllerId} </select> <!-- 鏍规嵁鏉′欢鑾峰彇娴佹氮鎺у埗鍣ㄤ俊鎭�--> @@ -138,6 +138,12 @@ AND protocol = #{protocol,jdbcType=VARCHAR} </if> </where> + <trim prefix="limit " > + <if test="start != null and count != null"> + #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER} + </if> + </trim> + order by rtuAddr desc </select> <!-- 鏍规嵁鏉′欢鑾峰彇娴佹氮鎺у埗鍣ㄦ暟閲�--> <select id="getTrampControllersCount" resultType="java.lang.Long"> -- Gitblit v1.8.0