From b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 12 十二月 2025 15:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
index da79a92..680627d 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
@@ -2,13 +2,19 @@
import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.domain.Depot;
+import com.fzzy.igds.domain.Dept;
+import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.service.DicService;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import javax.annotation.Resource;
import java.util.List;
@@ -20,13 +26,20 @@
@Slf4j
@Component
public class CommonManager {
+
@Resource
private DepotService depotService;
@Resource
private DicService dicService;
+ @Resource
+ private CoreDeptService coreDeptService;
+
+ @Autowired
+ private ISysUserService userService;
/**
* 鏍规嵁瀛楀吀绫诲瀷鑾峰彇瀛楀吀鍒楄〃
+ *
* @param parentCode
* @param companyId
* @return
@@ -58,9 +71,19 @@
}
+ /**
+ * 鑾峰彇鍒嗗簱鍒楄〃
+ *
+ * @author sgj
+ * @date 2025/12/12
+ */
+ public List<Dept> listDeptData() {
+ return coreDeptService.getDeptData();
+ }
/**
* 鏍规嵁浠撳簱缂栫爜鑾峰彇浠撳簱绫诲瀷
+ *
* @param depotId
* @return
*/
@@ -74,4 +97,17 @@
return depotType;
}
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鍒楄〃
+ *
+ * @author sgj
+ * @date 2025/12/12
+ */
+ public List<SysUser> listUserData() {
+ SysUser user = new SysUser() ;
+ user.setCompanyId(ContextUtil.getCompanyId());
+ user.setDeptId(Long.valueOf(ContextUtil.subDeptId(null)));
+ return userService.selectUserList(user);
+ }
}
--
Gitblit v1.9.3