From 6f5cbf0cc66eb9e6c7f70cce9e40ea298e2f60f1 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Thu, 5 Nov 2020 10:11:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/StaffRoleController.java | 5 +++-- .../com/lz/modules/app/dto/StaffRoleInfo.java | 3 +++ .../modules/flow/dao/StaffRoleMenuMapper.java | 2 ++ .../flow/service/StaffRoleMenuService.java | 2 ++ .../impl/StaffRoleMenuServiceImpl.java | 6 ++++++ .../service/impl/StaffRoleServiceImpl.java | 20 ++++++++++++++++--- .../mapper/flow/StaffRoleMenuMapper.xml | 8 +++++++- 7 files changed, 40 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java index 22db83be..b1157696 100644 --- a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java +++ b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java @@ -204,20 +204,21 @@ public class StaffRoleController { return R.ok(); } - // http://localhost:8080/lz_management/user/lzstaffrole/role/set + // http://localhost:8080/lz_management/user/lzstaffrole/role/set?pageSize=100 @RequestMapping("/role/set") public R roleSet(RoleModel roleModel) { return staffRoleService.selectRoleInfoBy(roleModel); } // http://localhost:8080/lz_management/user/lzstaffrole/role/detail?id=4 + // http://localhost:8080/lz_management/user/lzstaffrole/role/detail @RequestMapping("/role/detail") public R roleDetail(RoleModel roleModel) { return staffRoleService.selectRoleDetail(roleModel); } - // 老板add :http://localhost:8080/lz_management/user/lzstaffrole/role/addOrUpdate?departmentLevel=BOSS&staffId=294 + // 老板add :http://localhost:8080/lz_management/user/lzstaffrole/role/addOrUpdate?departmentLevel=MASTER_PM&staffId=395 // 老板edit :http://localhost:8080/lz_management/user/lzstaffrole/role/addOrUpdate?id=24&staffId=294 // 普通add: http://localhost:8080/lz_management/user/lzstaffrole/role/addOrUpdate?departmentLevel=CHILD_PM&staffId=28&evaluationGroupId=1&evaluationGroupInfoStr=2,3&departmentId=2&departmentInfoStr=154332270,379635019&selectStaffMenuInfoStr=15,17 // 普通add: http://localhost:8080/lz_management/user/lzstaffrole/role/addOrUpdate?id=26&evaluationGroupId=1&evaluationGroupInfoStr=2,4&departmentId=2&departmentInfoStr=154332270,379635019&selectStaffMenuInfoStr=15,17 diff --git a/src/main/java/com/lz/modules/app/dto/StaffRoleInfo.java b/src/main/java/com/lz/modules/app/dto/StaffRoleInfo.java index f8853d50..149f3269 100644 --- a/src/main/java/com/lz/modules/app/dto/StaffRoleInfo.java +++ b/src/main/java/com/lz/modules/app/dto/StaffRoleInfo.java @@ -11,9 +11,12 @@ public class StaffRoleInfo { private Long staffId; private int functionModel = 1; private Long departmentId; + private List deparmentNames; private Long evaluationGroupId; //@ApiModelProperty(value = "0表示全部部门，1 所在部门及以下部门，2表示特定部门", name = "departmentId") private int canSee = 1; private List menuNames; + private int menuId; + private Long id ; } diff --git a/src/main/java/com/lz/modules/flow/dao/StaffRoleMenuMapper.java b/src/main/java/com/lz/modules/flow/dao/StaffRoleMenuMapper.java index f61e03d8..e54d0f04 100644 --- a/src/main/java/com/lz/modules/flow/dao/StaffRoleMenuMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/StaffRoleMenuMapper.java @@ -37,4 +37,6 @@ public interface StaffRoleMenuMapper extends BaseMapper { List selectByRoleId(@Param("roleId") Long roleId); void deleteStaffRoleMenuByRoleId(@Param("roleId") Long roleId); + + StaffRoleMenu selectStaffRoleMenuByRoleIdMenuId(@Param("roleId") Long roleId, @Param("menuId") long menuId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/StaffRoleMenuService.java b/src/main/java/com/lz/modules/flow/service/StaffRoleMenuService.java index 460ff922..3fa438ad 100644 --- a/src/main/java/com/lz/modules/flow/service/StaffRoleMenuService.java +++ b/src/main/java/com/lz/modules/flow/service/StaffRoleMenuService.java @@ -36,4 +36,6 @@ public interface StaffRoleMenuService extends IService { List selectByRoleId(Long id); void deleteStaffRoleMenuByRoleId(Long roleId); + + StaffRoleMenu selectStaffRoleMenuByRoleIdMenuId(Long roleId, long menuId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleMenuServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleMenuServiceImpl.java index b936ff41..8da237d0 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleMenuServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleMenuServiceImpl.java @@ -71,5 +71,11 @@ public class StaffRoleMenuServiceImpl extends ServiceImpl deparmentNames = new ArrayList<>(); + if (staffRole.getDepartmentId().equals(new Long(2))) { + List staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId()); + for(StaffRoleDepartment staffRoleDepartment:staffRoleDepartments){ + DepartmentsEntity departmentsEntity = departmentsDao.selectByDepartmentId(staffRoleDepartment.getDepartmentId()); + deparmentNames.add(departmentsEntity.getDepartmentName()); + } + } + StaffRoleMenu staffRoleMenu = staffRoleMenuService.selectStaffRoleMenuByRoleIdMenuId(staffRole.getId(), 1l); + staffRoleInfo.setMenuId(staffRoleMenu != null ? 0 : 1); + staffRoleInfo.setDeparmentNames(deparmentNames); staffRoleInfo.setMenuNames(menuNames); + childPm.add(staffRoleInfo); } pageUtils.setList(childPm); @@ -346,10 +360,10 @@ public class StaffRoleServiceImpl extends ServiceImpl staffRoleDepartments = staffRoleDepartmentMapper.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId()); diff --git a/src/main/resources/mapper/flow/StaffRoleMenuMapper.xml b/src/main/resources/mapper/flow/StaffRoleMenuMapper.xml index 0aac4175..3185a8f7 100644 --- a/src/main/resources/mapper/flow/StaffRoleMenuMapper.xml +++ b/src/main/resources/mapper/flow/StaffRoleMenuMapper.xml @@ -80,11 +80,17 @@ select * from lz_staff_menu where id in (select menu_id from lz_staff_role_menu where role_id = #{roleId}) - delete from lz_staff_role_menu where role_id = #{roleId} + + + + +