gxwebsoft/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复：添加项目成员的bug

Browse Source
This commit is contained in:
赵忠林
2025-03-05 22:54:27 +08:00
parent 4644fe91ce
commit 0aa6e3025a
3 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/gxwebsoft/oa/controller/OaAppUserController.java
View File

@@ -41,11 +41,8 @@ public class OaAppUserController extends BaseController {
@ApiOperation("查询全部应用成员")
@GetMapping()
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')")
@@ -53,19 +50,13 @@ public class OaAppUserController extends BaseController {
@ApiOperation("根据id查询应用成员")
@GetMapping("/{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("添加应用成员")
@PostMapping()
public ApiResult<?> save(@RequestBody OaAppUser oaAppUser) {
// 记录当前登录用户id
User loginUser = getLoginUser();
if (loginUser != null) {
oaAppUser.setUserId(loginUser.getUserId());
}
if (oaAppUserService.save(oaAppUser)) {
return success("添加成功");
}

2
src/main/java/com/gxwebsoft/oa/service/impl/OaAppUserServiceImpl.java
View File

@@ -23,7 +23,6 @@ public class OaAppUserServiceImpl extends ServiceImpl<OaAppUserMapper, OaAppUser
@Override
public PageResult<OaAppUser> pageRel(OaAppUserParam param) {
PageParam<OaAppUser, OaAppUserParam> page = new PageParam<>(param);
page.setDefaultOrder("create_time desc");
List<OaAppUser> list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@@ -33,7 +32,6 @@ public class OaAppUserServiceImpl extends ServiceImpl<OaAppUserMapper, OaAppUser
List<OaAppUser> list = baseMapper.selectListRel(param);
// 排序
PageParam<OaAppUser, OaAppUserParam> page = new PageParam<>();
page.setDefaultOrder("create_time desc");
return page.sortRecords(list);
}

2
src/main/resources/application.yml
View File

@@ -3,7 +3,7 @@ server:
port: 8000
# socketIo
socketio:
port: 30091
port: 9091
# 多环境配置
spring:
profiles: