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 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 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 @@