获取子用户

ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysUserMapper.java

@@ -235,14 +235,6 @@ public interface SysUserMapper extends ExtendMapper<SysUser> {
 	 */
 	int operationsNum(@Param("userId") Long userId, @Param("num") Integer num);
 
-	/**
-	 * id查询记录
-	 * @param whichUserId
-	 * @param id
-	 * @return
-	 */
-	List<SelectData<Void>> getReviewList(@Param("userId") Long whichUserId,@Param("roleCode") String roleCode);
-
 	/**
 	 * 修改数量
 	 * @param userId

ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysUserService.java

@@ -227,19 +227,6 @@ public interface SysUserService extends ExtendService<SysUser> {
 
 	/**
 	 * 扣减数量
-	 *
-	 * @param userId
-	 * @param storeName
-	 * @return
 	 */
 	Boolean deductionQuantity(Long userId, String storeName);
-
-	/**
-	 * 获取该公司重审列表
-	 *
-	 * @param whichUserId
-	 * @param roleCode
-	 * @return
-	 */
-	List<SelectData<Void>> getUserByRoleAndWhichId(Long whichUserId, String roleCode);
 }

ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysUserServiceImpl.java

@@ -542,7 +542,11 @@ public class SysUserServiceImpl extends ExtendServiceImpl<SysUserMapper, SysUser
 			if (sysUser.getChargingStatus() == 1) {
 				Integer residueClueNum = balanceVO.getResidueClueNum();
 				if (residueClueNum < 1) {
-					throw new BadRequestException("用户" + balanceVO.getUsername() + "\n店铺:" + storeName + "\n可用数量不足!");
+					if (StringUtils.isNotBlank(storeName)){
+						throw new BadRequestException("用户" + balanceVO.getUsername() + "\n店铺:" + storeName + "\n可用数量不足!");
+					} else{
+						throw new BadRequestException("用户" + balanceVO.getUsername() + "\n可用数量不足!");
+					}
 				}
 				return baseMapper.operationsNum(userId, balanceVO.getResidueClueNum() - 1) > 0;
 			}
@@ -553,9 +557,4 @@ public class SysUserServiceImpl extends ExtendServiceImpl<SysUserMapper, SysUser
 		return Boolean.FALSE;
 	}
 
-	@Override
-	public List<SelectData<Void>> getUserByRoleAndWhichId(Long whichUserId, String roleCode) {
-		return baseMapper.getReviewList(whichUserId, roleCode);
-	}
-
 }

ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -202,16 +202,4 @@
 		</if>
 		AND su.deleted = 0
 	</select>
-
-	<select id="getReviewList" resultType="com.baiye.domain.SelectData">
-		select su.username as name,
-			   su.user_id as value
-		from
-			sys_user su
-	    JOIN
-		sys_user_role sur ON su.user_id = sur.user_id
-		where
-			su.which_user_id = #{userId}
-		and sur.role_code = #{roleCode}
-	</select>
 </mapper>

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<List<SelectData<Void>>> recharge() {
-		return R.ok(sysUserService.getUserByRoleAndWhichId
-				(SecurityUtils.getWhichUserId(), RoleCodeEnum.ROLE_REVIEWER.getRoleCode()));
-	}
-
 	@Operation(summary = "获取父用户下的指定角色的人员", description = "获取父用户下的指定角色的人员")
 	@GetMapping("/findSalesman/{roleId}")
-	public R<Object> findDirectSalesman(@PathVariable("roleId") Long roleId) {
+	public R<Object> 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<Object> findRoleSonUser(@PathVariable("roleId") Long roleId) {
+		String directSalesmanCode = RoleCodeEnum.find(roleId);
+		return R.ok(sysUserService.listByRoleCodeAndUserId(directSalesmanCode, SecurityUtils.getCurrentUserId()));
+	}
 }