From 2bf13f02d213d1bc631d3a973c44aa2c8c9c6535 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 七月 2025 23:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java | 70 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
index 8751f4a..931929f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
@@ -189,8 +189,17 @@
if (deptType == 1) {
// 项目部人员
if(CollectionUtils.isEmpty(query.getProjectId())){
+ TProjectDept projectDept = projectDeptService.getById(deptId);
List<String> projectIds = new ArrayList<>();
- projectIds.add(deptId);
+ if("0".equals(projectDept.getParentId())){
+ List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
+ .eq(TProjectDept::getStatus, 1)
+ .eq(TProjectDept::getParentId, projectDept.getId()));
+ List<String> ids = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());
+ projectIds.addAll(ids);
+ }else {
+ projectIds.add(deptId);
+ }
query.setProjectId(projectIds);
}
}else {
@@ -345,8 +354,17 @@
if (deptType == 1) {
// 项目部人员
if(CollectionUtils.isEmpty(query.getProjectId())){
+ TProjectDept projectDept = projectDeptService.getById(deptId);
List<String> projectIds = new ArrayList<>();
- projectIds.add(deptId);
+ if("0".equals(projectDept.getParentId())){
+ List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
+ .eq(TProjectDept::getStatus, 1)
+ .eq(TProjectDept::getParentId, projectDept.getId()));
+ List<String> ids = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());
+ projectIds.addAll(ids);
+ }else {
+ projectIds.add(deptId);
+ }
query.setProjectId(projectIds);
}
}else {
@@ -519,8 +537,17 @@
if (deptType == 1) {
// 项目部人员
if(CollectionUtils.isEmpty(query.getProjectId())){
+ TProjectDept projectDept = projectDeptService.getById(deptId);
List<String> projectIds = new ArrayList<>();
- projectIds.add(deptId);
+ if("0".equals(projectDept.getParentId())){
+ List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
+ .eq(TProjectDept::getStatus, 1)
+ .eq(TProjectDept::getParentId, projectDept.getId()));
+ List<String> ids = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());
+ projectIds.addAll(ids);
+ }else {
+ projectIds.add(deptId);
+ }
query.setProjectId(projectIds);
}
}else {
@@ -682,8 +709,17 @@
if (deptType == 1) {
// 项目部人员
if(CollectionUtils.isEmpty(query.getProjectId())){
+ TProjectDept projectDept = projectDeptService.getById(deptId);
List<String> projectIds = new ArrayList<>();
- projectIds.add(deptId);
+ if("0".equals(projectDept.getParentId())){
+ List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
+ .eq(TProjectDept::getStatus, 1)
+ .eq(TProjectDept::getParentId, projectDept.getId()));
+ List<String> ids = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());
+ projectIds.addAll(ids);
+ }else {
+ projectIds.add(deptId);
+ }
query.setProjectId(projectIds);
}
}else {
@@ -796,8 +832,17 @@
if (deptType == 1) {
// 项目部人员
if(CollectionUtils.isEmpty(query.getProjectId())){
+ TProjectDept projectDept = projectDeptService.getById(deptId);
List<String> projectIds = new ArrayList<>();
- projectIds.add(deptId);
+ if("0".equals(projectDept.getParentId())){
+ List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
+ .eq(TProjectDept::getStatus, 1)
+ .eq(TProjectDept::getParentId, projectDept.getId()));
+ List<String> ids = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());
+ projectIds.addAll(ids);
+ }else {
+ projectIds.add(deptId);
+ }
query.setProjectId(projectIds);
}
}else {
@@ -951,8 +996,17 @@
if (deptType == 1) {
// 项目部人员
if(CollectionUtils.isEmpty(query.getProjectId())){
+ TProjectDept projectDept = projectDeptService.getById(deptId);
List<String> projectIds = new ArrayList<>();
- projectIds.add(deptId);
+ if("0".equals(projectDept.getParentId())){
+ List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
+ .eq(TProjectDept::getStatus, 1)
+ .eq(TProjectDept::getParentId, projectDept.getId()));
+ List<String> ids = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());
+ projectIds.addAll(ids);
+ }else {
+ projectIds.add(deptId);
+ }
query.setProjectId(projectIds);
}
}else {
@@ -1010,7 +1064,7 @@
.eq(TDictData::getDataType, 2));
List<AnalysisUnqualifiedCleaningDetailVO> analysisUnqualifiedCleaningDetailVOS = new ArrayList<>();
for (TDictData tDictData : dictDataList) {
- List<TTaskDetail> tTaskDetails = taskDetailList.stream().filter(taskDetail -> taskDetail.getUnqualified().equals(tDictData.getId())).collect(Collectors.toList());
+ List<TTaskDetail> tTaskDetails = taskDetailList.stream().filter(taskDetail -> StringUtils.isNotEmpty(taskDetail.getUnqualified())&&taskDetail.getUnqualified().equals(tDictData.getId())).collect(Collectors.toList());
AnalysisUnqualifiedCleaningDetailVO analysisUnqualifiedCleaningDetailVO = new AnalysisUnqualifiedCleaningDetailVO();
analysisUnqualifiedCleaningDetailVO.setUnqualifiedName(tDictData.getDataContent());
analysisUnqualifiedCleaningDetailVO.setCount(tTaskDetails.size());
@@ -1079,7 +1133,7 @@
.eq(TDictData::getDataType, 2));
List<AnalysisUnqualifiedCleaningDetailVO> analysisUnqualifiedCleaningDetailVOS = new ArrayList<>();
for (TDictData tDictData : dictDataList) {
- List<TTaskDetail> tTaskDetails = taskDetailList.stream().filter(taskDetail -> taskDetail.getUnqualified().equals(tDictData.getId())).collect(Collectors.toList());
+ List<TTaskDetail> tTaskDetails = taskDetailList.stream().filter(taskDetail -> StringUtils.isNotEmpty(taskDetail.getUnqualified())&&taskDetail.getUnqualified().equals(tDictData.getId())).collect(Collectors.toList());
AnalysisUnqualifiedCleaningDetailVO analysisUnqualifiedCleaningDetailVO = new AnalysisUnqualifiedCleaningDetailVO();
analysisUnqualifiedCleaningDetailVO.setUnqualifiedName(tDictData.getDataContent());
analysisUnqualifiedCleaningDetailVO.setCount(tTaskDetails.size());
--
Gitblit v1.7.1