opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 18:15:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.部门负责人变更为Long类型 绑定为用户id

Browse Source
This commit is contained in:
Lionel 2023-08-08 13:10:05 +08:00
parent ce64d5a5c1
commit ac1c892622
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java
View File

@ -47,7 +47,7 @@ public class SysDept extends TenantEntity {
/**
* 负责人
*/
private String leader;
private Long leader;
/**
* 联系电话

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java
View File

@ -50,7 +50,7 @@ public class SysDeptBo extends BaseEntity {
/**
* 负责人
*/
private String leader;
private Long leader;
/**
* 联系电话

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java
View File

@ -61,7 +61,7 @@ public class SysDeptVo implements Serializable {
* 负责人
*/
@ExcelProperty(value = "负责人")
private String leader;
private Long leader;
/**
* 联系电话

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java
View File

@ -94,6 +94,6 @@ public class SysUserExportVo implements Serializable {
*/
@ReverseAutoMapping(target = "leader", source = "dept.leader")
@ExcelProperty(value = "部门负责人")
private String leader;
private Long leader;
}

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java
View File

@ -132,7 +132,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
SysDept dept = new SysDept();
dept.setTenantId(tenantId);
dept.setDeptName(bo.getCompanyName());
dept.setLeader(bo.getUsername());
//部门负责人变更为存储userid，不自动设置。如需设置为当前新增用户，则新增用户后，修改dept表
dept.setParentId(Constants.TOP_PARENT_ID);
dept.setAncestors(Constants.TOP_PARENT_ID.toString());
deptMapper.insert(dept);

6
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
View File

@ -521,9 +521,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
*/
@Override
public List<SysUserVo> selectUserListByDept(Long deptId) {
SysUserBo sysUserBo = new SysUserBo();
sysUserBo.setDeptId(deptId);
return baseMapper.selectUserList(this.buildQueryWrapper(sysUserBo));
LambdaQueryWrapper<SysUser> lqw = Wrappers.lambdaQuery();
lqw.eq(deptId!=null,SysUser::getDeptId,deptId);
return baseMapper.selectVoList(lqw);
}
@Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId")