From ebf94cb3ed4f487ca1fcd7069db0ca141553a4db Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 20 六月 2025 17:52:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 357f769..d9408c4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -692,16 +692,21 @@
}
Integer deptType = sysUserVO.getDeptType();
if (1==deptType){
- TProjectDept tProjectDept = projectDeptMapper.selectById(sysUserVO.getDeptId());
- if (!tProjectDept.getParentId().equals("0")){
- TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
- sysUserVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
- }else{
- sysUserVO.setDeptName(tProjectDept.getProjectName());
- }
+ TProjectDept tProjectDept = projectDeptMapper.selectById(sysUserVO.getDeptId());
+ if (!tProjectDept.getParentId().equals("0")){
+ TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
+ sysUserVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
+ }else{
+ sysUserVO.setDeptName(tProjectDept.getProjectName());
+ }
}else{
- TDept tDept = deptMapper.selectById(sysUserVO.getDeptId());
- sysUserVO.setDeptName(tDept.getDeptName());
+ if (sysUserVO.getUserId()==1){
+ sysUserVO.setDeptName("公司");
+ }else{
+ TDept tDept = deptMapper.selectById(sysUserVO.getDeptId());
+ sysUserVO.setDeptName(tDept.getDeptName());
+ }
+
}
}
pageInfo.setTotal(list.size());
--
Gitblit v1.7.1