修复:添加项目成员的bug
This commit is contained in:
@@ -41,11 +41,8 @@ public class OaAppUserController extends BaseController {
|
|||||||
@ApiOperation("查询全部应用成员")
|
@ApiOperation("查询全部应用成员")
|
||||||
@GetMapping()
|
@GetMapping()
|
||||||
public ApiResult<List<OaAppUser>> list(OaAppUserParam param) {
|
public ApiResult<List<OaAppUser>> list(OaAppUserParam param) {
|
||||||
PageParam<OaAppUser, OaAppUserParam> page = new PageParam<>(param);
|
|
||||||
page.setDefaultOrder("create_time desc");
|
|
||||||
return success(oaAppUserService.list(page.getOrderWrapper()));
|
|
||||||
// 使用关联查询
|
// 使用关联查询
|
||||||
//return success(oaAppUserService.listRel(param));
|
return success(oaAppUserService.listRel(param));
|
||||||
}
|
}
|
||||||
|
|
||||||
@PreAuthorize("hasAuthority('oa:oaAppUser:list')")
|
@PreAuthorize("hasAuthority('oa:oaAppUser:list')")
|
||||||
@@ -53,19 +50,13 @@ public class OaAppUserController extends BaseController {
|
|||||||
@ApiOperation("根据id查询应用成员")
|
@ApiOperation("根据id查询应用成员")
|
||||||
@GetMapping("/{id}")
|
@GetMapping("/{id}")
|
||||||
public ApiResult<OaAppUser> get(@PathVariable("id") Integer id) {
|
public ApiResult<OaAppUser> get(@PathVariable("id") Integer id) {
|
||||||
return success(oaAppUserService.getById(id));
|
|
||||||
// 使用关联查询
|
// 使用关联查询
|
||||||
//return success(oaAppUserService.getByIdRel(id));
|
return success(oaAppUserService.getByIdRel(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation("添加应用成员")
|
@ApiOperation("添加应用成员")
|
||||||
@PostMapping()
|
@PostMapping()
|
||||||
public ApiResult<?> save(@RequestBody OaAppUser oaAppUser) {
|
public ApiResult<?> save(@RequestBody OaAppUser oaAppUser) {
|
||||||
// 记录当前登录用户id
|
|
||||||
User loginUser = getLoginUser();
|
|
||||||
if (loginUser != null) {
|
|
||||||
oaAppUser.setUserId(loginUser.getUserId());
|
|
||||||
}
|
|
||||||
if (oaAppUserService.save(oaAppUser)) {
|
if (oaAppUserService.save(oaAppUser)) {
|
||||||
return success("添加成功");
|
return success("添加成功");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ public class OaAppUserServiceImpl extends ServiceImpl<OaAppUserMapper, OaAppUser
|
|||||||
@Override
|
@Override
|
||||||
public PageResult<OaAppUser> pageRel(OaAppUserParam param) {
|
public PageResult<OaAppUser> pageRel(OaAppUserParam param) {
|
||||||
PageParam<OaAppUser, OaAppUserParam> page = new PageParam<>(param);
|
PageParam<OaAppUser, OaAppUserParam> page = new PageParam<>(param);
|
||||||
page.setDefaultOrder("create_time desc");
|
|
||||||
List<OaAppUser> list = baseMapper.selectPageRel(page, param);
|
List<OaAppUser> list = baseMapper.selectPageRel(page, param);
|
||||||
return new PageResult<>(list, page.getTotal());
|
return new PageResult<>(list, page.getTotal());
|
||||||
}
|
}
|
||||||
@@ -33,7 +32,6 @@ public class OaAppUserServiceImpl extends ServiceImpl<OaAppUserMapper, OaAppUser
|
|||||||
List<OaAppUser> list = baseMapper.selectListRel(param);
|
List<OaAppUser> list = baseMapper.selectListRel(param);
|
||||||
// 排序
|
// 排序
|
||||||
PageParam<OaAppUser, OaAppUserParam> page = new PageParam<>();
|
PageParam<OaAppUser, OaAppUserParam> page = new PageParam<>();
|
||||||
page.setDefaultOrder("create_time desc");
|
|
||||||
return page.sortRecords(list);
|
return page.sortRecords(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ server:
|
|||||||
port: 8000
|
port: 8000
|
||||||
# socketIo
|
# socketIo
|
||||||
socketio:
|
socketio:
|
||||||
port: 30091
|
port: 9091
|
||||||
# 多环境配置
|
# 多环境配置
|
||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
|
|||||||
Reference in New Issue
Block a user