From ac1c892622c540178aa7169d8fecf4b618a8d876 Mon Sep 17 00:00:00 2001 From: Lionel <12719401+wisdom_woods@user.noreply.gitee.com> Date: Tue, 8 Aug 2023 13:10:05 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=83=A8=E9=97=A8=E8=B4=9F=E8=B4=A3=E4=BA=BA?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=B8=BALong=E7=B1=BB=E5=9E=8B=20=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E4=B8=BA=E7=94=A8=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/dromara/system/domain/SysDept.java | 2 +- .../main/java/org/dromara/system/domain/bo/SysDeptBo.java | 2 +- .../main/java/org/dromara/system/domain/vo/SysDeptVo.java | 2 +- .../java/org/dromara/system/domain/vo/SysUserExportVo.java | 2 +- .../dromara/system/service/impl/SysTenantServiceImpl.java | 2 +- .../org/dromara/system/service/impl/SysUserServiceImpl.java | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java index d7ad7c4a8..70f1a9ad0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java @@ -47,7 +47,7 @@ public class SysDept extends TenantEntity { /** * 负责人 */ - private String leader; + private Long leader; /** * 联系电话 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java index 44f405273..613977dc0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java @@ -50,7 +50,7 @@ public class SysDeptBo extends BaseEntity { /** * 负责人 */ - private String leader; + private Long leader; /** * 联系电话 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java index e09d67e12..671e5793d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java @@ -61,7 +61,7 @@ public class SysDeptVo implements Serializable { * 负责人 */ @ExcelProperty(value = "负责人") - private String leader; + private Long leader; /** * 联系电话 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java index 21b1efbec..d01b3df50 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java @@ -94,6 +94,6 @@ public class SysUserExportVo implements Serializable { */ @ReverseAutoMapping(target = "leader", source = "dept.leader") @ExcelProperty(value = "部门负责人") - private String leader; + private Long leader; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java index eb681519a..375e01190 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java @@ -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); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index 1af4dcec3..1cc0cb5a0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -521,9 +521,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { */ @Override public List selectUserListByDept(Long deptId) { - SysUserBo sysUserBo = new SysUserBo(); - sysUserBo.setDeptId(deptId); - return baseMapper.selectUserList(this.buildQueryWrapper(sysUserBo)); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(deptId!=null,SysUser::getDeptId,deptId); + return baseMapper.selectVoList(lqw); } @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId")