From a595d6a5383841351d1a901c8f6b64722af07471 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Mon, 16 Dec 2024 15:08:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E8=A1=8C=E4=BA=BA=E6=8A=8A=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E4=BA=BA=E8=87=AA=E5=8A=A8=E5=B8=A6=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lSun <15893999301@qq.com>
---
 .../holiday/service/RequestReportServiceImpl.java      | 10 +++++++---
 .../src/main/resources/mapper/basic/SysUserMapper.xml  |  2 +-
 .../main/resources/mapper/evection/EvectionMapper.xml  |  9 +++++----
 .../resources/mapper/wechat/WechatEvectionMapper.xml   |  8 ++++----
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/RequestReportServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/RequestReportServiceImpl.java
index d6cd62a..1be11a2 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/RequestReportServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/RequestReportServiceImpl.java
@@ -85,9 +85,13 @@ public class RequestReportServiceImpl implements RequestReportService {
             if (StringHelper.isNotEmpty(workReportBean.getHostUserId())) {
                 String[] checkIds = workReportBean.getHostUserId().split(",");
                 for (String checkId : checkIds) {
-                    SysUser sysUser = userMapper.selectUserById(Long.valueOf(checkId));
-                    String userName = sysUser.getUserName();
-                    name.append(userName).append(",");
+                    if(checkId.equals("0")){
+                        name.append("/").append("");
+                    }else{
+                        SysUser sysUser = userMapper.selectUserById(Long.valueOf(checkId));
+                        String userName = sysUser.getUserName();
+                        name.append(userName).append(",");
+                    }
                 }
                 // 如果 name 不为空，移除最后一个逗号
                 if (name.length() > 0) {
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml
index 8506756..5ad063e 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml
@@ -275,7 +275,7 @@
 			sys_user
 		WHERE
 			is_active = 1
-		  AND user_name IS NOT NULL and  user_id!=#{userId}
+		  AND user_name IS NOT NULL
 	</select>
 	<select id="checkUserNameUnique" resultType="com.bonus.system.api.domain.SysUser">
 		select user_id as userId, id_number as idNumber
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml
index d8dcd39..4458767 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml
@@ -67,8 +67,8 @@
 
     <select id="getEvectionList" resultType="com.bonus.system.evection.entity.EvectionBean">
         SELECT a.*,
-        GROUP_CONCAT( CASE WHEN a.user_ids != su.user_id THEN a.user_ids END SEPARATOR ', ' ) AS travelers,
-        GROUP_CONCAT( CASE WHEN a.user_names != su.user_name THEN a.user_names END SEPARATOR ', ' ) AS travelersName,
+        GROUP_CONCAT( a.user_ids SEPARATOR ', ' ) AS travelers,
+        GROUP_CONCAT( a.user_names SEPARATOR ', ' ) AS travelersName,
         su.user_id ,su.user_name
         FROM (
         SELECT
@@ -135,8 +135,8 @@
     <select id="selectEvectionById"
             resultType="com.bonus.system.evection.entity.EvectionBean">
         SELECT a.*,
-               GROUP_CONCAT( CASE WHEN a.user_ids != su.user_id THEN a.user_ids END SEPARATOR ', ' ) AS travelers,
-               GROUP_CONCAT( CASE WHEN a.user_names != su.user_name THEN a.user_names END SEPARATOR ', ' ) AS travelersName,
+               GROUP_CONCAT( a.user_ids SEPARATOR ', ' ) AS travelers,
+               GROUP_CONCAT( a.user_names SEPARATOR ', ' ) AS travelersName,
                su.user_id,
                su.user_name
         FROM (SELECT l.id,
@@ -157,6 +157,7 @@
                      l.leave_form_id                           as uuid,
                      l.submit_id,
                      l.host_user_id,
+                     l.host_user_name,
                      l.is_agree,
                      l.location,
                      l.remark
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatEvectionMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatEvectionMapper.xml
index fe858e5..ad66ca9 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatEvectionMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatEvectionMapper.xml
@@ -6,8 +6,8 @@
 
     <select id="getEvectionList" resultType="com.bonus.system.wechat.entity.WechatEvectionBean">
         SELECT a.*,
-        GROUP_CONCAT( CASE WHEN a.user_ids != su.user_id THEN a.user_ids END SEPARATOR ', ' ) AS travelers,
-        GROUP_CONCAT( CASE WHEN a.user_names != su.user_name THEN a.user_names END SEPARATOR ', ' ) AS travelersName,
+        GROUP_CONCAT( a.user_ids SEPARATOR ', ' ) AS travelers,
+        GROUP_CONCAT( a.user_names SEPARATOR ', ' ) AS travelersName,
         su.user_id ,su.user_name
         FROM (
         SELECT
@@ -72,8 +72,8 @@
     <select id="selectEvectionById"
             resultType="com.bonus.system.wechat.entity.WechatEvectionBean">
         SELECT a.*,
-               GROUP_CONCAT( CASE WHEN a.user_ids != su.user_id THEN a.user_ids END SEPARATOR ', ' ) AS travelers,
-               GROUP_CONCAT( CASE WHEN a.user_names != su.user_name THEN a.user_names END SEPARATOR ', ' ) AS travelersName,
+               GROUP_CONCAT( a.user_ids SEPARATOR ', ' ) AS travelers,
+               GROUP_CONCAT( a.user_names SEPARATOR ', ' ) AS travelersName,
                su.user_id,
                su.user_name
         FROM (SELECT l.id,