diff --git a/hiver-core/src/main/java/cc/hiver/core/dao/UserDao.java b/hiver-core/src/main/java/cc/hiver/core/dao/UserDao.java index cda5acd2..9a5e56d0 100644 --- a/hiver-core/src/main/java/cc/hiver/core/dao/UserDao.java +++ b/hiver-core/src/main/java/cc/hiver/core/dao/UserDao.java @@ -14,6 +14,14 @@ import java.util.List; * @author Yazhi Li */ public interface UserDao extends HiverBaseDao { + /** + * 获得下级用户 + * + * @param userId + * @return + */ + List findAllByInviteCode(String userId); + /** * 通过用户名获取用户 * diff --git a/hiver-core/src/main/java/cc/hiver/core/service/UserService.java b/hiver-core/src/main/java/cc/hiver/core/service/UserService.java index 7b01e101..1ef40bf2 100644 --- a/hiver-core/src/main/java/cc/hiver/core/service/UserService.java +++ b/hiver-core/src/main/java/cc/hiver/core/service/UserService.java @@ -71,6 +71,14 @@ public interface UserService extends HiverBaseService { */ List findByDepartmentId(String departmentId); + /** + * 获得所有下级用户 + * + * @param userId + * @return + */ + List findAllByInviteCode(String userId); + /** * 通过用户名模糊搜索 * diff --git a/hiver-core/src/main/java/cc/hiver/core/serviceimpl/UserServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/serviceimpl/UserServiceImpl.java index 01458b25..2d407dcc 100644 --- a/hiver-core/src/main/java/cc/hiver/core/serviceimpl/UserServiceImpl.java +++ b/hiver-core/src/main/java/cc/hiver/core/serviceimpl/UserServiceImpl.java @@ -221,6 +221,11 @@ public class UserServiceImpl implements UserService { return userDao.findByDepartmentId(departmentId); } + @Override + public List findAllByInviteCode(String userId) { + return userDao.findAllByInviteCode(userId); + } + @Override public List findByUsernameLikeAndStatus(String username, Integer status) { return userDao.findByUsernameLikeAndStatus(username, status); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CommonController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CommonController.java index a5971bcc..151c7742 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CommonController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CommonController.java @@ -121,4 +121,15 @@ public class CommonController { Page page = userService.findByConditionForMobile(user, searchVo, PageUtil.initPage(pageVo)); return new ResultUtil>().setData(page); } + + @RequestMapping(value = "/user/list", method = RequestMethod.GET) + @ApiOperation(value = "获得用户下级用户") + public Result> getUserList() { + User u = securityUtil.getCurrUser(); + // 清除持久上下文环境 避免后面语句导致持久化 + entityManager.detach(u); + u.setPassword(null); + List users = userService.findAllByInviteCode(u.getId()); + return new ResultUtil>().setData(users); + } }