From 096296cd7485c5583c8194d88cca700e3c4d84a0 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 01 十二月 2025 16:50:42 +0800
Subject: [PATCH] 调整基础配置信息查询方式，取消jpa
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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..46da167 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
@@ -25,6 +25,7 @@
private CoreCompanyService companyService;
@Resource
private CoreDeptService deptService;
+
/**
* selectDeptPR#listCompany
* 鏍规嵁琛屾斂鍖哄垝浠ｇ爜鑾峰彇 浼佷笟淇℃伅鍒楄〃
@@ -37,11 +38,11 @@
SysUser user = ContextUtil.getLoginUser();
if(FrameworkConfig.getCompanyId().equals(user.getCompanyId())){
- //绯荤粺鐩戠璐﹀彿
- return companyService.getAllData(user.getCompanyId());
+ //绯荤粺鐩戠璐﹀彿锛岃幏鍙栫粍缁囦笅鎵�鏈夊叕鍙镐俊鎭�
+ return companyService.listCompany(null, user.getCompanyId(), null);
}else {
- //鏀跺偍鍏徃璐﹀彿
- return companyService.getDataById(user.getCompanyId());
+ //鏀跺偍鍏徃璐﹀彿锛屽彧鑾峰彇褰撳墠鍏徃淇℃伅
+ return companyService.listCompany(user.getCompanyId(), null, null);
}
}
@@ -49,11 +50,11 @@
/**
* 鑾峰彇鍏徃涓嬪睘搴撳尯鍒楄〃
* 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