|
|
@@ -33,6 +33,7 @@ import org.springframework.util.Assert;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
|
@@ -63,6 +64,8 @@ public class UserController {
|
|
|
|
|
|
private final WorkOrderFrontService workOrderFrontService;
|
|
|
|
|
|
+ private final HttpServletRequest request;
|
|
|
+
|
|
|
@GetMapping(value = "/wx/whoami")
|
|
|
public Result<UserWhoami> whoami() {
|
|
|
long userId = StpUserUtil.getLoginIdAsLong();
|
|
|
@@ -163,8 +166,8 @@ public class UserController {
|
|
|
*/
|
|
|
@GetMapping("/workOrder/get")
|
|
|
public Result<SearchResult<WorkOrder>> getWorkOrder() {
|
|
|
- long userId = StpUserUtil.getLoginIdAsLong();
|
|
|
- SearchResult<WorkOrder> search = beanSearcher.search(WorkOrder.class, MapUtils.builder()
|
|
|
+ long userId = 11470l;
|
|
|
+ SearchResult<WorkOrder> search = beanSearcher.search(WorkOrder.class, MapUtils.flatBuilder(request.getParameterMap())
|
|
|
.field(WorkOrder::getUserId, userId)
|
|
|
.orderBy(WorkOrder::getId).desc()
|
|
|
.onlySelect(WorkOrder::getId, WorkOrder::getTopic, WorkOrder::getStatus, WorkOrder::getCreatedTime)
|