去掉firstleveldept
This commit is contained in:
parent
e3123315d8
commit
1a49cce3da
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
<id property="userId" column="user_id"/>
|
||||
<result property="deptId" column="dept_id"/>
|
||||
<result property="companyId" column="company_id"/>
|
||||
<result property="firstLevelDeptId" column="first_level_dept_id"/>
|
||||
<result property="userName" column="user_name"/>
|
||||
<result property="nickName" column="nick_name"/>
|
||||
<result property="email" column="email"/>
|
||||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Reference in New Issue