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-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
index 4c9faf3..ccdd21c 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.utils.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -44,8 +45,12 @@
}
if (Constant.USER_TYPE_30.equals(user.getUserType())) {
//搴撳尯鐢ㄦ埛
- return this.listCompany(user.getDeptId()+"",null,null);
-
+ List<Company> companies = new ArrayList<>();
+ if (user.getDeptId() != null && StringUtils.isNotBlank(user.getDeptId().toString())) {
+ String substring = user.getDeptId().toString().substring(0, user.getDeptId().toString().length() - 3);
+ companies = this.listCompany(substring, null, null);
+ }
+ return companies;
}
return this.listCompany(null,user.getCompanyId(),null);
}
--
Gitblit v1.9.3