github/SpringBlade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⚡ 优化代码

Browse Source
This commit is contained in:
smallchill 2019-02-15 11:20:46 +08:00
parent 81b4c904dc
commit 27c847526b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
View File

@ -30,6 +30,7 @@ import org.springblade.core.tool.utils.Func;
import org.springblade.system.feign.IDictClient;
import org.springblade.system.user.entity.User;
import org.springblade.system.user.service.IUserService;
import org.springblade.system.user.vo.UserVO;
import org.springblade.system.user.wrapper.UserWrapper;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@ -56,7 +57,7 @@ public class UserController {
*/
@ApiOperation(value = "查看详情", notes = "传入id", position = 1)
@GetMapping("/detail")
public R<User> detail(User user) {
public R<UserVO> detail(User user) {
User detail = userService.getOne(Condition.getQueryWrapper(user));
UserWrapper userWrapper = new UserWrapper(userService, dictClient);
return R.data(userWrapper.entityVO(detail));
@ -71,9 +72,10 @@ public class UserController {
@ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
})
@ApiOperation(value = "列表", notes = "传入account和realName", position = 2)
public R<IPage<User>> list(@ApiIgnore @RequestParam Map<String, Object> user, Query query) {
public R<IPage<UserVO>> list(@ApiIgnore @RequestParam Map<String, Object> user, Query query) {
IPage<User> pages = userService.page(Condition.getPage(query), Condition.getQueryWrapper(user, User.class));
return R.data(pages);
UserWrapper userWrapper = new UserWrapper(userService, dictClient);
return R.data(userWrapper.pageVO(pages));
}
/**