From 0dee81f06575d115d64adde8fc3a4ea94607f9ef Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 06 Aug 2021 11:44:17 +0800
Subject: [PATCH] 1.考试报名新增判断，同一人，同一场考试，已报名且未考试，审核通过和待审核的不能再次报名 2.考试接口修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 47720f3..c22906f 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -124,8 +124,8 @@
@ApiOperation(value = "列表", notes = "传入account和realName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, "000000");
- return R.data(UserWrapper.build().pageVO(pages));
+ IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, "000000");
+ return R.data(pages);
}
/**
@@ -137,8 +137,6 @@
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R submit(@Valid @RequestBody User user) throws Exception {
CacheUtil.clear(USER_CACHE);
- arg arg = new arg();
- arg.test01(arg.url+"/blade-user/save",user);
return R.status(userService.submit(user));
}
--
Gitblit v1.9.3