From 99116b79d38f4d88f6884ab0b6c5da9b78107e02 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 26 十二月 2025 11:05:00 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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..cee7d46 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,6 +1,7 @@
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;
@@ -37,16 +38,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