From 45e035bfb4c196fd8c58946d560da69006de6689 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 15 十月 2025 19:11:36 +0800
Subject: [PATCH] 广告无形资产广告字段简写修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java
index ccaf76f..1b6d502 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.TDept;
import com.ruoyi.system.mapper.TDeptMapper;
import com.ruoyi.system.service.TDeptService;
@@ -10,6 +9,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -37,7 +37,6 @@
@Override
public List<Integer> getAllSubDeptIds(String deptId) {
List<Integer> allSubIds = new ArrayList<>();
- allSubIds.add(Integer.valueOf(deptId));
getSubDeptIdsRecursive(Integer.valueOf(deptId), allSubIds);
return allSubIds.stream().distinct().collect(Collectors.toList());
}
@@ -50,6 +49,8 @@
// 递归查询下级的下级
getSubDeptIdsRecursive(subId, allSubIds);
}
+ allSubIds.add(Integer.valueOf(parentId));
+
}
/**
* 构建部门树结构
@@ -79,4 +80,14 @@
.peek(dept -> dept.setChildren(getChildren(dept, depts)))
.collect(Collectors.toList());
}
+
+ @Override
+ public Optional<List<Integer>> getQueryDeptAndChildIds(Integer deptId) {
+ if (deptId != null) {
+ List<Integer> allDeptIds = new ArrayList<>();
+ getSubDeptIdsRecursive(deptId, allDeptIds);
+ return Optional.of(allDeptIds.stream().distinct().collect(Collectors.toList()));
+ }
+ return Optional.empty();
+ }
}
--
Gitblit v1.7.1