提交 9eff798b authored 作者: 宋文杰's avatar 宋文杰

feat(user): add get self users restful api

上级 fba32466
...@@ -167,5 +167,17 @@ public class UserController extends BaseController { ...@@ -167,5 +167,17 @@ public class UserController extends BaseController {
public R getSelfAndChildUsers(@PathVariable Integer deptid){ public R getSelfAndChildUsers(@PathVariable Integer deptid){
return new R<>(userService.getSelfAndChildUsers(deptid)); return new R<>(userService.getSelfAndChildUsers(deptid));
} }
/**
* @Description: 获取本部门的员工信息
* @Param: [deptId]
* @return: com.elephant.framework.galaxy.aroad.response.R
* @Author: songwenjie
* @Date: 2019/4/30
*/
@GetMapping("/self/{deptId}")
public R getSelfUsers(@PathVariable Integer deptId){
return new R<>(userService.getSelfUsers(deptId));
}
} }
...@@ -56,6 +56,15 @@ public interface UserMapper extends BaseMapper<User> { ...@@ -56,6 +56,15 @@ public interface UserMapper extends BaseMapper<User> {
*/ */
List<UserVO> getSelfAndChildUsers(@Param("deptIds") List<Integer> deptIds); List<UserVO> getSelfAndChildUsers(@Param("deptIds") List<Integer> deptIds);
/**
* @Description: 查询本部门的员工信息
* @Param: [deptId]
* @return: java.util.List<com.elephant.framework.galaxy.aroad.module.system.vo.UserVO>
* @Author: songwenjie
* @Date: 2019/4/30
*/
List<UserVO> getSelfUsers(@Param("deptId") Integer deptId);
/** /**
* @Description: 根据用户id批量查询用户信息 * @Description: 根据用户id批量查询用户信息
* @Param: [userIds] * @Param: [userIds]
......
...@@ -9,6 +9,7 @@ import com.elephant.framework.galaxy.aroad.module.system.entity.User; ...@@ -9,6 +9,7 @@ import com.elephant.framework.galaxy.aroad.module.system.entity.User;
import com.elephant.framework.galaxy.aroad.module.system.vo.UserVO; import com.elephant.framework.galaxy.aroad.module.system.vo.UserVO;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.elephant.framework.galaxy.aroad.response.R; import com.elephant.framework.galaxy.aroad.response.R;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -106,6 +107,15 @@ public interface UserService extends IService<User> { ...@@ -106,6 +107,15 @@ public interface UserService extends IService<User> {
*/ */
List<UserVO> getSelfAndChildUsers(Integer selfDeptId); List<UserVO> getSelfAndChildUsers(Integer selfDeptId);
/**
* @Description: 查询本部门的员工信息
* @Param: [deptId]
* @return: java.util.List<com.elephant.framework.galaxy.aroad.module.system.vo.UserVO>
* @Author: songwenjie
* @Date: 2019/4/30
*/
List<UserVO> getSelfUsers(Integer deptId);
/** /**
* @Description: 根据用户id批量查询用户信息 * @Description: 根据用户id批量查询用户信息
* @Param: [userIds] * @Param: [userIds]
......
...@@ -23,6 +23,7 @@ import com.elephant.framework.galaxy.aroad.response.R; ...@@ -23,6 +23,7 @@ import com.elephant.framework.galaxy.aroad.response.R;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CacheEvict;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
...@@ -260,6 +261,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us ...@@ -260,6 +261,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
return baseMapper.getSelfAndChildUsers(deptIds); return baseMapper.getSelfAndChildUsers(deptIds);
} }
/**
* @Description: 查询本部门的员工信息
* @Param: [deptId]
* @return: java.util.List<com.elephant.framework.galaxy.aroad.module.system.vo.UserVO>
* @Author: songwenjie
* @Date: 2019/4/30
*/
public List<UserVO> getSelfUsers(Integer deptId){
return baseMapper.getSelfUsers(deptId);
}
/** /**
* @Description: 根据用户id批量查询用户信息 * @Description: 根据用户id批量查询用户信息
......
...@@ -179,6 +179,15 @@ ...@@ -179,6 +179,15 @@
</foreach> </foreach>
</select> </select>
<select id="getSelfUsers" resultMap="userDeptResultMap">
select
u.user_id,u.username
from sys_dept d
inner join sys_user u
on d.dept_id = u.dept_id
where d.dept_id = #{deptId}
</select>
<select id="getUsers" resultMap="memberDtoMap"> <select id="getUsers" resultMap="memberDtoMap">
select select
user_id,username as name,phone user_id,username as name,phone
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论