From c7854a9422258be4d352a20b9557fd8365a35427 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 23 一月 2026 14:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
index 54714fd..bf4ca17 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
@@ -74,13 +74,18 @@
screenUserVo.setName(param.getName());
screenUserVo.setPermissionClient(param.getPermissionClient());
screenUserVo.setPermissionProject(param.getPermissionProject());
+ screenUserVo.setCommentType(param.getCommentType());
}
}else if(type==2){
Project project = projectService.getById(id);
if(project==null){
return R.fail("项目不存在");
}
-
+ Client client = clientService.getById(project.getClientId());
+ ClientParam param = clientParamService.getOne(new LambdaQueryWrapper<ClientParam>().eq(ClientParam::getClientId, client.getId()));
+ if(param!=null){
+ screenUserVo.setCommentType(param.getCommentType());
+ }
screenUserVo.setName(project.getName());
screenUserVo.setPermissionProject(project.getPermission());
}
--
Gitblit v1.7.1