diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java index 7f4b803..def1c70 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java @@ -50,12 +50,6 @@ public class SysUser extends BaseEntity { @JsonFormat(shape = JsonFormat.Shape.STRING) private Long companyId; - /** - * 根公司下第一级分公司的deptId - */ - @JsonFormat(shape = JsonFormat.Shape.STRING) - private Long firstLevelDeptId; - /** * 用户账号 */ @@ -228,14 +222,6 @@ public class SysUser extends BaseEntity { this.companyId = companyId; } - public Long getFirstLevelDeptId() { - return firstLevelDeptId; - } - - public void setFirstLevelDeptId(Long firstLevelDeptId) { - this.firstLevelDeptId = firstLevelDeptId; - } - @Xss(message = "用户昵称不能包含脚本字符") @Size(min = 0, max = 200, message = "用户昵称长度不能超过200个字符") public String getNickName() { diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java index be64605..8519a5f 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java @@ -88,7 +88,6 @@ public class SysDeptServiceImpl implements ISysDeptService dept.setDeptName(str); } dept.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); - //dept.setDeptId(SecurityUtils.getLoginUser().getSysUser().getFirstLevelDeptId()); return deptMapper.selectDeptList(dept); } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index 4057fa8..e460200 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -8,7 +8,6 @@ - @@ -66,12 +65,6 @@ ELSE SUBSTRING_INDEX(SUBSTRING_INDEX(d.ancestors, ',', 2), ',', -1) END as company_id, --- CASE --- WHEN (LENGTH(d.ancestors) - LENGTH(REPLACE(d.ancestors, ',', ''))) = 1 THEN --- d.dept_id --- ELSE --- SUBSTRING_INDEX(SUBSTRING_INDEX(d.ancestors, ',', 3), ',', -1) --- END as first_level_dept_id, u.user_name, u.nick_name, u.email,