From 1f455e5cda9016054c531bbae6b1639fe646628f Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 27 十一月 2025 19:36:37 +0800
Subject: [PATCH] 框架调整，及库区切换
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
index d376ebb..ad5fde1 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
@@ -1,10 +1,13 @@
package com.fzzy.igds.service;
+import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.repository.DeptRepository;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysDeptService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
@@ -19,19 +22,33 @@
public class CoreDeptService {
@Resource
+ private ISysDeptService iSysDeptService;
+ @Resource
private DeptRepository deptRepository;
+
/**
* jpa鏌ヨ淇℃伅
- * @param companyId
+ * @param parentId
* @return
*/
- public List<Dept> getAllData(String companyId) {
+ public List<Dept> getDataByParentId(String parentId) {
+ return deptRepository.getDataByParentId(parentId + "%");
+ }
- if (StringUtils.isEmpty(companyId)) {
- companyId = ContextUtil.getCompanyId();
+
+ /**
+ * jpa鏌ヨ淇℃伅
+ * @return
+ */
+ public List<Dept> getDeptData() {
+ SysUser user = ContextUtil.getLoginUser();
+ SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
+ if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
+ return deptRepository.getDataById(ContextUtil.subDeptId(user));
+ }else {
+ return deptRepository.getDataByParentId(user.getDeptId() + "%");
}
- return deptRepository.getAllData(companyId);
}
/**
--
Gitblit v1.9.3