|
|
@@ -34,7 +34,6 @@ import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
-import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
@@ -100,20 +99,16 @@ public class UserController {
|
|
|
@GetMapping("/page")
|
|
|
@Parameters({
|
|
|
@Parameter(name = "account", description = "账号名", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
|
|
|
- @Parameter(name = "realName", description = "姓名", in = ParameterIn.QUERY, schema = @Schema(type = "string"))
|
|
|
- })
|
|
|
+ @Parameter(name = "realName", description = "姓名", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
|
|
|
+ @Parameter(name = "tenantName", description = "所属企业", in = ParameterIn.QUERY, schema = @Schema(type = "string"))
|
|
|
+ })
|
|
|
@ApiOperationSupport(order = 3)
|
|
|
- @Operation(summary = "列表", description = "传入account和realName")
|
|
|
- public R<IPage<UserVO>> page(@Parameter(hidden = true) User user, Query query, Long deptId, KdUser kdUser) {
|
|
|
- Date now = new Date();
|
|
|
- System.out.println("开始:" + now);
|
|
|
- IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (kdUser.getTenantId().equals(KdConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : kdUser.getTenantId()));
|
|
|
- System.out.println("开始1:" + (new Date().getTime()-now.getTime()));
|
|
|
- now = new Date();
|
|
|
- IPage<UserVO> page = UserWrapper.build().pageVO(pages);
|
|
|
- System.out.println("耗时:" + (new Date().getTime() - now.getTime()));
|
|
|
-
|
|
|
- return R.data(page);
|
|
|
+ @Operation(summary = "列表", description = "传入account、realName、tenantName")
|
|
|
+ public R<IPage<UserVO>> page(@Parameter(hidden = true) UserVO user, Query query, KdUser kdUser) {
|
|
|
+ IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, (kdUser.getTenantId().equals(KdConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : kdUser.getTenantId()));
|
|
|
+// IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, kdUser.getTenantId());
|
|
|
+// IPage<UserVO> page = UserWrapper.build().pageVO(pages);
|
|
|
+ return R.data(pages);
|
|
|
}
|
|
|
|
|
|
/**
|