From 66e1e898f5020b5e02a99e361569637a72f8c2cf Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 29 十二月 2025 14:31:45 +0800
Subject: [PATCH] 优化公司、库区、仓库页面，通知单word导出提交
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java | 9 +++++----
1 files changed, 5 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 d95b23a..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,8 +59,7 @@
*/
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() + "%");
@@ -88,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