用户管理
This commit is contained in:
parent
77abbcae6e
commit
3716aa44e4
|
|
@ -101,6 +101,12 @@ public class SysUser extends BaseEntity
|
|||
/** 角色编码 */
|
||||
private String roleName;
|
||||
|
||||
/** 项目部名称 */
|
||||
private String departName;
|
||||
|
||||
/** 负责人名称 */
|
||||
private String headName;
|
||||
|
||||
public SysUser()
|
||||
{
|
||||
|
||||
|
|
@ -341,6 +347,22 @@ public class SysUser extends BaseEntity
|
|||
this.roleName = roleName;
|
||||
}
|
||||
|
||||
public String getDepartName() {
|
||||
return departName;
|
||||
}
|
||||
|
||||
public void setDepartName(String departName) {
|
||||
this.departName = departName;
|
||||
}
|
||||
|
||||
public String getHeadName() {
|
||||
return headName;
|
||||
}
|
||||
|
||||
public void setHeadName(String headName) {
|
||||
this.headName = headName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
|
|
@ -367,6 +389,8 @@ public class SysUser extends BaseEntity
|
|||
.append("teamId", getTeamId())
|
||||
.append("roleCode", getRoleCode())
|
||||
.append("roleName", getRoleName())
|
||||
.append("departName", getDepartName())
|
||||
.append("headName", getHeadName())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -387,4 +387,18 @@ public class SysUserController extends BaseController {
|
|||
public AjaxResult userAssociationTeam(@RequestBody SysUser user) {
|
||||
return userService.userAssociationTeam(user);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取项目部树
|
||||
*/
|
||||
@RequiresPermissions("system:user:list")
|
||||
@GetMapping("/departTree")
|
||||
public AjaxResult departTree(SysDept dept) {
|
||||
try {
|
||||
return success(deptService.selectDepartTreeList(dept));
|
||||
} catch (Exception e) {
|
||||
logger.error(e.toString(), e);
|
||||
}
|
||||
return error("系统异常,请联系管理员");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -115,4 +115,13 @@ public interface SysDeptMapper
|
|||
* @return 结果
|
||||
*/
|
||||
public int deleteDeptById(Long deptId);
|
||||
|
||||
/**
|
||||
* 查询项目部
|
||||
* @param dept
|
||||
* @return List<SysDept>
|
||||
* @author cwchen
|
||||
* @date 2024/7/15 18:25
|
||||
*/
|
||||
List<SysDept> selectDepartTreeList(SysDept dept);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,4 +121,10 @@ public interface ISysDeptService
|
|||
* @return 结果
|
||||
*/
|
||||
public int deleteDeptById(Long deptId);
|
||||
|
||||
/**
|
||||
* 获取项目部树
|
||||
* */
|
||||
public List<TreeSelect> selectDepartTreeList(SysDept dept);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -335,4 +335,10 @@ public class SysDeptServiceImpl implements ISysDeptService
|
|||
{
|
||||
return getChildList(list, t).size() > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<TreeSelect> selectDepartTreeList(SysDept dept) {
|
||||
List<SysDept> depts = deptMapper.selectDepartTreeList(dept);
|
||||
return buildDeptTreeSelect(depts);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,8 +84,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<include refid="selectDeptVo"/>
|
||||
where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
|
||||
</select>
|
||||
|
||||
<insert id="insertDept" parameterType="SysDept">
|
||||
<!--查询项目部-->
|
||||
<select id="selectDepartTreeList" resultType="com.bonus.system.api.domain.SysDept">
|
||||
SELECT 0 AS deptId,'项目部' AS deptName,-1 AS parentId
|
||||
UNION ALL
|
||||
SELECT id AS deptId,depart_name AS deptName,0 AS parentId FROM tb_project_depart WHERE del_flag = '0'
|
||||
</select>
|
||||
|
||||
<insert id="insertDept" parameterType="SysDept">
|
||||
insert into sys_dept(
|
||||
<if test="deptId != null and deptId != 0">dept_id,</if>
|
||||
<if test="parentId != null and parentId != 0">parent_id,</if>
|
||||
|
|
|
|||
|
|
@ -94,9 +94,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
|
||||
</select>
|
||||
<!--校验角色编码是否唯一-->
|
||||
<select id="checkRoleCodeUnique" resultType="com.bonus.system.api.domain.SysRole">
|
||||
<select id="checkRoleCodeUnique" resultMap="SysRoleResult">
|
||||
<include refid="selectRoleVo"/>
|
||||
where r.role_code=#{roleCode} and r.del_flag = '0' limit 1
|
||||
where r.role_code=#{roleCode} and r.del_flag = '0' limit 1
|
||||
</select>
|
||||
|
||||
<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="teamId" column="team_id"/>
|
||||
<result property="roleCode" column="role_code"/>
|
||||
<result property="roleName" column="role_name"/>
|
||||
<result property="departName" column="depart_name"/>
|
||||
<result property="headName" column="head_name"/>
|
||||
<association property="dept" javaType="SysDept" resultMap="deptResult" />
|
||||
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
|
||||
|
||||
|
|
@ -62,8 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</sql>
|
||||
|
||||
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
|
||||
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,u.login_type,u.team_id,sr.role_code,sr.role_name from sys_user u
|
||||
left join sys_dept d on u.dept_id = d.dept_id
|
||||
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.depart_name, d.head_name,u.login_type,u.team_id,sr.role_code,sr.role_name from sys_user u
|
||||
left join tb_project_depart d on u.dept_id = d.id
|
||||
LEFT JOIN sys_user_role sur ON u.user_id = sur.user_id
|
||||
LEFT JOIN sys_role sr ON sur.role_id = sr.role_id AND sr.del_flag = '0'
|
||||
where u.del_flag = '0'
|
||||
|
|
|
|||
Loading…
Reference in New Issue