From f1e70d3246fe269cfa5d2353efbeee8c91061f3b Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 21 一月 2026 18:05:38 +0800
Subject: [PATCH] 仓库列表优化
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 da45a32..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;
@@ -25,6 +25,7 @@
private CoreCompanyService companyService;
@Resource
private CoreDeptService deptService;
+
/**
* selectDeptPR#listCompany
* 鏍规嵁琛屾斂鍖哄垝浠ｇ爜鑾峰彇 浼佷笟淇℃伅鍒楄〃
@@ -36,24 +37,30 @@
//鑾峰彇褰撳墠鐧诲綍浜�
SysUser user = ContextUtil.getLoginUser();
- if(FrameworkConfig.getCompanyId().equals(user.getCompanyId())){
- //绯荤粺鐩戠璐﹀彿
- return companyService.getAllData(user.getCompanyId());
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
+ //鏀跺偍鍏徃璐﹀彿锛屽彧鑾峰彇褰撳墠鍏徃淇℃伅
+ return companyService.listCompany(user.getCompanyId(), null, null);
}else {
- //鏀跺偍鍏徃璐﹀彿
- return companyService.getDataById(user.getCompanyId());
+ //绯荤粺鐩戠璐﹀彿锛岃幏鍙栫粍缁囦笅鎵�鏈夊叕鍙镐俊鎭�
+ return companyService.listCompany(null, user.getCompanyId(), null);
}
}
+
+
+
+
+
+
/**
* 鑾峰彇鍏徃涓嬪睘搴撳尯鍒楄〃
* selectDeptPR#listArea
- * @param id
+ * @param parentId
* @return
*/
@DataProvider
- public List<Dept> listArea(String id){
- return deptService.getDataByParentId(id);
+ public List<Dept> listArea(String parentId){
+ return deptService.listDept(null,null, parentId);
}
}
--
Gitblit v1.9.3