From c44c76ea3e1f6b70bb84bdde85ffd1b389e5b8f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 四月 2025 10:58:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/api/web/WebWorkOrderController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
index 147c29f..06ad2fc 100644
--- a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
+++ b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
@@ -4,6 +4,7 @@
import com.doumee.config.annotation.EncryptionReq;
import com.doumee.config.annotation.EncryptionResp;
import com.doumee.config.annotation.LoginRequired;
+import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
@@ -17,6 +18,7 @@
import com.doumee.service.business.ManagersService;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.WorkorderService;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.java.Log;
@@ -212,7 +214,8 @@
try {
Member member = jwtTokenUtil.getUserInfoByToken(token);
pageWrap.getModel().setQwId(member.getQwId());
- return ApiResponse.success(workorderService.findPage(pageWrap));
+ PageData<Workorder> pageData = workorderService.findPage(pageWrap);
+ return ApiResponse.success(pageData);
}catch (BusinessException e){
return ApiResponse.failed(e.getCode(),e.getMessage());
}catch (Exception e){
--
Gitblit v1.9.3