From 1d618b47fdec85a24137b520fbc84bda70112fc3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 20 六月 2025 18:21:57 +0800
Subject: [PATCH] 点位导入
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 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 3b86e89..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
@@ -690,22 +690,25 @@
sysUserVO.setRoleName(sysRole.getRoleName());
}
}
- String deptType = sysUserVO.getDeptType();
- if (org.springframework.util.StringUtils.hasLength(deptType)){
- if ("1".equals(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());
- }
+ 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());
+ }
}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());
if (org.springframework.util.StringUtils.hasLength(query.getDeptName())){
List<SysUserVO> collect = list.stream().filter(sysUserVO -> sysUserVO.getDeptName().contains(query.getDeptName())).collect(Collectors.toList());
@@ -728,6 +731,11 @@
}
@Override
+ public List<SysUser> selectUserByTempLateId(String templateId) {
+ return userMapper.selectUserByTempLateId(templateId);
+ }
+
+ @Override
public SysUser selectByPhone(String phonenumber) {
return userMapper.selectByPhone(phonenumber);
}
--
Gitblit v1.7.1