| | |
|---|
| | | @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, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId())); |
|---|
| | | return R.data(UserWrapper.build().pageVO(pages)); |
|---|
| | | IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId())); |
|---|
| | | return R.data(pages); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
| | |
|---|
| | | if (user.getRtime() == null) { |
|---|
| | | rtime = null; |
|---|
| | | } else { |
|---|
| | | rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime()); |
|---|
| | | rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | String s1 = |
|---|
