From 53cf557068952a2a5354311356342ba5e88919fe Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 29 一月 2026 11:36:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java | 4 ++++
1 files changed, 4 insertions(+), 0 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 375954c..05489a3 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
@@ -78,6 +78,8 @@
screenUserVo.setCommentType(param.getCommentType());
screenUserVo.setSafetyId(param.getSafetyId());
screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
+ screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
+ screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
}
}else if(type==2){
Project project = projectService.getById(id);
@@ -90,6 +92,8 @@
screenUserVo.setCommentType(param.getCommentType());
screenUserVo.setSafetyId(param.getSafetyId());
screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
+ screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
+ screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
}
screenUserVo.setName(project.getName());
screenUserVo.setPermissionProject(project.getPermission());
--
Gitblit v1.7.1