From 1afb2a9df1a582efac30c8c12e01fdeab8b60ec7 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 19 十月 2022 09:52:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
index 6c0844d..977e4d2 100644
--- a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
+++ b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
@@ -51,9 +51,9 @@
department_id,
classify_id,
consult_content,
- concat(consult_user_name,consult_user_phone) consultUser,
+ concat((IFNULL(consult_user_name,'')),(IFNULL(consult_user_phone,''))) consultUser,
consult_user_name,
- concat((select user_name from automessage_sys_user where a.submit_user_id=user_id ), submit_user_phone) submitUser,
+ concat((IFNULL((select user_name from automessage_sys_user where a.submit_user_id=user_id ),'')), (IFNULL(submit_user_phone,''))) submitUser,
submit_user_id,
concat((IFNULL((select user_name from automessage_sys_user where a.guide_user_id=user_id ),'')), (ifnull(guide_user_phone,''))) guideUser,
guide_user_id,
--
Gitblit v1.7.1