From 1369c87ddcc0e76e17d01208ef66261ee0cd27da Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 二月 2026 18:13:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
index 9ba2825..02c08f7 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
@@ -215,8 +215,7 @@
* @date 2025/12/17
*/
public List<Company> listCompanyData() {
- SysUser user = ContextUtil.getLoginUser();
- return coreCompanyService.listCompany(null, null, user.getDeptId() + "");
+ return coreCompanyService.getCompanyByUserType();
}
@@ -244,7 +243,7 @@
MainData mainData = new MainData();
//寰呭姙宸ュ崟鏁�
- Integer orderNum = workOrderService.getNumByUser(WorkStatus.STATUS_30.getCode(), user.getLoginName());
+ Integer orderNum = workOrderService.getTodoNumByUser(user);
mainData.setOrderNum(orderNum);
//缁熻鍑哄叆搴撲俊鎭�
--
Gitblit v1.9.3