From a09e361bfcb68a809e9143eca87bed2d66af2216 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Nov 2024 11:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml b/src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml
index 4871895..5a133e1 100644
--- a/src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml
+++ b/src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml
@@ -27,7 +27,7 @@
ys.per_in_cha as personInCha,ys.per_in_cha_pho as personInChaPhone,ys.address supAdd,
ys.lng,ys.lat,
bdb.dict_value as emeSupType,
- concat(yes.num,bdb1.dict_value) as numUnit
+ concat(yes.num,ifnull(bdb1.dict_value,'')) as numUnit
from
yw_emergency_supplies yes
left join yw_supplies ys on ys.id = yes.supplies_id and ys.is_deleted = 0
@@ -62,7 +62,7 @@
ys.per_in_cha as personInCha,ys.per_in_cha_pho as personInChaPhone,ys.address supAdd,
ys.lng,ys.lat,
bdb.dict_value as emeSupType,
- concat(yes.num,bdb1.dict_value) as numUnit
+ concat(yes.num,ifnull(bdb1.dict_value,'')) as numUnit
from
yw_emergency_supplies yes
left join yw_supplies ys on ys.id = yes.supplies_id and ys.is_deleted = 0
--
Gitblit v1.9.3