From 9c136c58963fb453c41865f658d4eef48d536d02 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 26 十二月 2025 17:56:46 +0800
Subject: [PATCH] 抓拍、ai事件查询修改；弹框调整；收储公司、库区、仓库页面交互优化
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 eefcd8d..d218b7a 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
@@ -49,7 +49,7 @@
if(StringUtils.isNotBlank(parentId)){
queryWrapper.likeRight("id", parentId);
}
-
+ queryWrapper.orderByAsc("id");
return coreDeptMapper.selectList(queryWrapper);
}
@@ -59,12 +59,21 @@
*/
public List<Dept> getDeptData() {
SysUser user = ContextUtil.getLoginUser();
- SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
- if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
return this.listDept(ContextUtil.subDeptId(user),null,null);
}else {
return this.listDept(null,null,user.getDeptId() + "%");
}
+ }
+
+ /**
+ * 鏍规嵁ID鏌ヨ搴撳尯淇℃伅
+ * @param id
+ * @return
+ */
+ public Dept getDeptById(String id) {
+
+ return coreDeptMapper.selectById(id);
}
/**
@@ -78,7 +87,9 @@
return;
}
Dept dept = new Dept();
- dept.setId(sysDept.getDeptId() + "");
+ String deptId = sysDept.getDeptId() + "";
+ dept.setId(deptId);
+ dept.setParentId(deptId.substring(0, deptId.length() - 3));
dept.setKqmc(sysDept.getDeptName());
dept.setCompanyId(sysDept.getCompanyId());
--
Gitblit v1.9.3