From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java
index a106f94..d0ee0a8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java
@@ -65,7 +65,7 @@
leaveListVO.setLeaveTime(start+"至"+end);
if (leaveListVO.getDeptType() == 1){
TProjectDept tProjectDept = projectDeptMapper.selectById(leaveListVO.getDeptId());
- if (!tProjectDept.getParentId().equals("0")){
+ if (!"0".equals(tProjectDept.getParentId())){
TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
leaveListVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
}else{
@@ -86,7 +86,11 @@
if (StringUtils.hasLength(query.getLeavePersonName())){
List<Long> collect = sysUsers.stream().filter(e -> e.getNickName().contains(query.getLeavePersonName()))
.map(SysUser::getUserId).collect(Collectors.toList());
+ if (collect.isEmpty()){
+ collect.add(0L);
+ }
query.setUserIds(collect);
+
}
PageInfo<LeaveUserListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<LeaveUserListVO> list = this.baseMapper.leaveList(query,pageInfo);
--
Gitblit v1.7.1