|
|
@@ -201,14 +201,17 @@ public class UserController extends AbstractApiController {
|
|
|
|
|
|
@PostMapping("/myUsers")
|
|
|
@ApiOperation(value = "获取我的下级用户和下下级",httpMethod = "POST")
|
|
|
- public Result<List<User>> myUsers(@RequestBody MyUserParam param, HttpServletRequest request, @RequestHeader(value = X_CLIENT_TOKEN_USERID,required = false) Long userId) {
|
|
|
+ public Result<List<User>> myUsers(@RequestBody MyUserParam param) {
|
|
|
PageHelper.startPage(param.getPage(), param.getSize());
|
|
|
Condition condition = new Condition(User.class);
|
|
|
Example.Criteria criteria = condition.createCriteria();
|
|
|
+ if (param.getType() == null){
|
|
|
+ param.setType(0);
|
|
|
+ }
|
|
|
if (param.getType() == 1){
|
|
|
- criteria.andEqualTo("pid",userId);
|
|
|
- } else {
|
|
|
- criteria.andEqualTo("ppid",userId);
|
|
|
+ criteria.andEqualTo("pid",param.getUserId());
|
|
|
+ } else if (param.getType() == 2){
|
|
|
+ criteria.andEqualTo("ppid",param.getUserId());
|
|
|
}
|
|
|
if (StrUtil.isNotBlank(param.getName())) {
|
|
|
criteria.andLike("name", "%" + param.getName() + "%");
|
