From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml
index 5a2b117..3145fb2 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml
@@ -45,7 +45,7 @@
<select id="selectGdTaskResultListByPatrolTaskId" resultMap="gdTaskResultResultMap">
SELECT tr.*,
- IFNULL(bu.real_name, bu.name) as distribute_user_name,
+ COALESCE(bu.real_name, bu.name) as distribute_user_name,
bd.dept_name as distribute_dept_name
FROM ja_gd_task_result tr
LEFT JOIN (SELECT *
--
Gitblit v1.9.3