From 0da03950e4e26ed5e8a16d1a6e0d352734519846 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 13 十月 2025 18:25:13 +0800
Subject: [PATCH] 新增最新证书功能
---
src/main/resources/mapper/LocMastMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 5749de9..fee4223 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -38,6 +38,7 @@
<result column="fire_status" property="fireStatus" />
<result column="pack_status" property="packStatus" />
<result column="channel" property="channel" />
+ <result column="freeze" property="freeze" />
</resultMap>
@@ -46,9 +47,14 @@
from asr_loc_mast
where row1=#{row}
and loc_sts='O'
- <if test="locType1 != null">
- and loc_type1 = #{locType1}
- </if>
+ <choose>
+ <when test="locType1 != null">
+ and loc_type1 = #{locType1}
+ </when>
+ <otherwise>
+ and 1!=1
+ </otherwise>
+ </choose>
order by lev1 asc,bay1 asc
</select>
@@ -70,7 +76,7 @@
from asr_loc_mast
where row1=#{row}
and loc_sts='O'
- <if test="locType2 != null and locType != 0">
+ <if test="locType2 != null and locType2 != 0">
and loc_type2 = #{locType2}
</if>
<if test="locType1 != null">
@@ -79,7 +85,7 @@
order by lev1 asc,bay1 asc
</select>
- <select id="queryFreeLocMastCount" resultMap="BaseResultMap">
+ <select id="queryFreeLocMastCount" resultType="int">
select count(1)
from asr_loc_mast
where row1=#{row}
--
Gitblit v1.9.1