Browse Source

增加用户创建的店员信息。

cangku
delicacylee 3 years ago
parent
commit
65b208eec0
  1. 8
      hiver-core/src/main/java/cc/hiver/core/dao/UserDao.java
  2. 8
      hiver-core/src/main/java/cc/hiver/core/service/UserService.java
  3. 5
      hiver-core/src/main/java/cc/hiver/core/serviceimpl/UserServiceImpl.java
  4. 11
      hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CommonController.java

8
hiver-core/src/main/java/cc/hiver/core/dao/UserDao.java

@ -14,6 +14,14 @@ import java.util.List;
* @author Yazhi Li * @author Yazhi Li
*/ */
public interface UserDao extends HiverBaseDao<User, String> { public interface UserDao extends HiverBaseDao<User, String> {
/**
* 获得下级用户
*
* @param userId
* @return
*/
List<User> findAllByInviteCode(String userId);
/** /**
* 通过用户名获取用户 * 通过用户名获取用户
* *

8
hiver-core/src/main/java/cc/hiver/core/service/UserService.java

@ -71,6 +71,14 @@ public interface UserService extends HiverBaseService<User, String> {
*/ */
List<User> findByDepartmentId(String departmentId); List<User> findByDepartmentId(String departmentId);
/**
* 获得所有下级用户
*
* @param userId
* @return
*/
List<User> findAllByInviteCode(String userId);
/** /**
* 通过用户名模糊搜索 * 通过用户名模糊搜索
* *

5
hiver-core/src/main/java/cc/hiver/core/serviceimpl/UserServiceImpl.java

@ -221,6 +221,11 @@ public class UserServiceImpl implements UserService {
return userDao.findByDepartmentId(departmentId); return userDao.findByDepartmentId(departmentId);
} }
@Override
public List<User> findAllByInviteCode(String userId) {
return userDao.findAllByInviteCode(userId);
}
@Override @Override
public List<User> findByUsernameLikeAndStatus(String username, Integer status) { public List<User> findByUsernameLikeAndStatus(String username, Integer status) {
return userDao.findByUsernameLikeAndStatus(username, status); return userDao.findByUsernameLikeAndStatus(username, status);

11
hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CommonController.java

@ -121,4 +121,15 @@ public class CommonController {
Page<User> page = userService.findByConditionForMobile(user, searchVo, PageUtil.initPage(pageVo)); Page<User> page = userService.findByConditionForMobile(user, searchVo, PageUtil.initPage(pageVo));
return new ResultUtil<Page<User>>().setData(page); return new ResultUtil<Page<User>>().setData(page);
} }
@RequestMapping(value = "/user/list", method = RequestMethod.GET)
@ApiOperation(value = "获得用户下级用户")
public Result<List<User>> getUserList() {
User u = securityUtil.getCurrUser();
// 清除持久上下文环境 避免后面语句导致持久化
entityManager.detach(u);
u.setPassword(null);
List<User> users = userService.findAllByInviteCode(u.getId());
return new ResultUtil<List<User>>().setData(users);
}
} }

Loading…
Cancel
Save