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 eb5a7f8..a1c7a9a 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 @@ -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(); } } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java index 652230e..ef012ff 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java @@ -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("系统异常,请联系管理员"); + } } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java index 19b98e3..618ba05 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java @@ -115,4 +115,13 @@ public interface SysDeptMapper * @return 结果 */ public int deleteDeptById(Long deptId); + + /** + * 查询项目部 + * @param dept + * @return List + * @author cwchen + * @date 2024/7/15 18:25 + */ + List selectDepartTreeList(SysDept dept); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java index 2e759af..5d4e98b 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java @@ -121,4 +121,10 @@ public interface ISysDeptService * @return 结果 */ public int deleteDeptById(Long deptId); + + /** + * 获取项目部树 + * */ + public List selectDepartTreeList(SysDept dept); + } 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 992e1f8..adef6bc 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 @@ -335,4 +335,10 @@ public class SysDeptServiceImpl implements ISysDeptService { return getChildList(list, t).size() > 0 ? true : false; } + + @Override + public List selectDepartTreeList(SysDept dept) { + List depts = deptMapper.selectDepartTreeList(dept); + return buildDeptTreeSelect(depts); + } } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml index ddb887c..6b632b5 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -84,8 +84,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1 - - + + + + insert into sys_dept( dept_id, parent_id, diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml index 410e74e..13a3b78 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -94,9 +94,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where r.role_key=#{roleKey} and r.del_flag = '0' limit 1 - - where r.role_code=#{roleCode} and r.del_flag = '0' limit 1 + where r.role_code=#{roleCode} and r.del_flag = '0' limit 1 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 eeeec2d..7807cd8 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 @@ -27,6 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -62,8 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"