From cac7ab84d3cb339d6d4e0961f48a104e268dbee4 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期六, 17 一月 2026 18:02:35 +0800
Subject: [PATCH] 代码合并修改2
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java
index 46da167..d08a1e0 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java
@@ -1,12 +1,12 @@
package com.fzzy.igds;
import com.bstek.dorado.annotation.DataProvider;
+import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.domain.Company;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.service.CoreCompanyService;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.utils.ContextUtil;
-import com.ruoyi.common.config.FrameworkConfig;
import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.stereotype.Component;
@@ -37,16 +37,22 @@
//鑾峰彇褰撳墠鐧诲綍浜�
SysUser user = ContextUtil.getLoginUser();
- if(FrameworkConfig.getCompanyId().equals(user.getCompanyId())){
- //绯荤粺鐩戠璐﹀彿锛岃幏鍙栫粍缁囦笅鎵�鏈夊叕鍙镐俊鎭�
- return companyService.listCompany(null, user.getCompanyId(), null);
- }else {
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
//鏀跺偍鍏徃璐﹀彿锛屽彧鑾峰彇褰撳墠鍏徃淇℃伅
return companyService.listCompany(user.getCompanyId(), null, null);
+ }else {
+ //绯荤粺鐩戠璐﹀彿锛岃幏鍙栫粍缁囦笅鎵�鏈夊叕鍙镐俊鎭�
+ return companyService.listCompany(null, user.getCompanyId(), null);
}
}
+
+
+
+
+
+
/**
* 鑾峰彇鍏徃涓嬪睘搴撳尯鍒楄〃
* selectDeptPR#listArea
--
Gitblit v1.9.3