From b9b1c54aacf1d97e3a80104659696d1f6dbf61a5 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 01 四月 2026 17:44:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java | 3 +++
1 files changed, 3 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 f75cebd..3b19da2 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
@@ -62,6 +62,7 @@
public R<ScreenUserVo> getLoginInfo(Integer type, Integer id) {
ScreenUserVo screenUserVo = new ScreenUserVo();
screenUserVo.setType(type);
+
if(type!=null && id !=null){
if(type==1){
@@ -69,6 +70,7 @@
if(client==null){
return R.fail("委托方不存在");
}
+ screenUserVo.setClientId(id);
ClientParam param = clientParamService.getOne(new LambdaQueryWrapper<ClientParam>().eq(ClientParam::getClientId, client.getId()));
if(param!=null){
screenUserVo.setLogo(param.getLogo());
@@ -92,6 +94,7 @@
return R.fail("项目不存在");
}
Client client = clientService.getById(project.getClientId());
+ screenUserVo.setClientId(client.getId());
ClientParam param = clientParamService.getOne(new LambdaQueryWrapper<ClientParam>().eq(ClientParam::getClientId, client.getId()));
if(param!=null){
screenUserVo.setLogo(param.getLogo());
--
Gitblit v1.7.1