diff --git a/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysUserMapper.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysUserMapper.java index d641477..16ef242 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysUserMapper.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysUserMapper.java @@ -235,14 +235,6 @@ public interface SysUserMapper extends ExtendMapper { */ int operationsNum(@Param("userId") Long userId, @Param("num") Integer num); - /** - * id查询记录 - * @param whichUserId - * @param id - * @return - */ - List> getReviewList(@Param("userId") Long whichUserId,@Param("roleCode") String roleCode); - /** * 修改数量 * @param userId diff --git a/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysUserService.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysUserService.java index 237dde2..a23a41f 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysUserService.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysUserService.java @@ -227,19 +227,6 @@ public interface SysUserService extends ExtendService { /** * 扣减数量 - * - * @param userId - * @param storeName - * @return */ Boolean deductionQuantity(Long userId, String storeName); - - /** - * 获取该公司重审列表 - * - * @param whichUserId - * @param roleCode - * @return - */ - List> getUserByRoleAndWhichId(Long whichUserId, String roleCode); } diff --git a/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysUserServiceImpl.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysUserServiceImpl.java index 387848b..b87735b 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysUserServiceImpl.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysUserServiceImpl.java @@ -542,7 +542,11 @@ public class SysUserServiceImpl extends ExtendServiceImpl 0; } @@ -553,9 +557,4 @@ public class SysUserServiceImpl extends ExtendServiceImpl> getUserByRoleAndWhichId(Long whichUserId, String roleCode) { - return baseMapper.getReviewList(whichUserId, roleCode); - } - } diff --git a/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml b/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml index 132a26e..5ac5c62 100644 --- a/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml @@ -202,16 +202,4 @@ AND su.deleted = 0 - - diff --git a/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysUserController.java b/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysUserController.java index 0a3a9a2..deeff74 100644 --- a/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysUserController.java +++ b/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysUserController.java @@ -295,18 +295,17 @@ public class SysUserController { : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "充值失败"); } - @Operation(summary = "重审", description = "重审列表") - @GetMapping("/review/list") - public R>> recharge() { - return R.ok(sysUserService.getUserByRoleAndWhichId - (SecurityUtils.getWhichUserId(), RoleCodeEnum.ROLE_REVIEWER.getRoleCode())); - } - @Operation(summary = "获取父用户下的指定角色的人员", description = "获取父用户下的指定角色的人员") @GetMapping("/findSalesman/{roleId}") - public R findDirectSalesman(@PathVariable("roleId") Long roleId) { + public R findSalesman(@PathVariable("roleId") Long roleId) { String directSalesmanCode = RoleCodeEnum.find(roleId); return R.ok(sysUserService.listByRoleCodeAndUserId(directSalesmanCode, SecurityUtils.getWhichUserId())); } + @Operation(summary = "查询当前用户的指定角色子用户", description = "查询当前用户的指定角色子用户") + @GetMapping("/findRoleSonUser/{roleId}") + public R findRoleSonUser(@PathVariable("roleId") Long roleId) { + String directSalesmanCode = RoleCodeEnum.find(roleId); + return R.ok(sysUserService.listByRoleCodeAndUserId(directSalesmanCode, SecurityUtils.getCurrentUserId())); + } }