From 7962389b62d5ecb53467c87d13268698bdfd1030 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 17 Feb 2025 11:15:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/purchase/PurApplyController.java  | 8 +++++---
 .../api/service/dev/impl/DeviceRepairServiceImpl.java     | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
index e04849ab0..aa719956b 100644
--- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
@@ -456,8 +456,7 @@ public class PurApplyController {
     public BaseResponse detailList(PurApplyDetailRequest purApplyDetailRequest) {
 
         List<PurOrderDetailResponse> purApplyDetailEntities = purApplyDetailService.joinQueryList(purApplyDetailRequest);
-        PageInfo<PurOrderDetailResponse> pageInfo;
-        pageInfo = new PageInfo<>(purApplyDetailEntities);
+        PageInfo<PurOrderDetailResponse> pageInfo  = new PageInfo<>(purApplyDetailEntities);
         PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyDetailEntities);
@@ -475,7 +474,10 @@ public class PurApplyController {
     public BaseResponse getDetailList(PurApplyDetailRequest purApplyDetailRequest) {
         List<PurOrderDetailResponse> list = purApplyDetailService.getDetailList(purApplyDetailRequest);
         PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(list);
-        return ResultVOUtils.page(pageInfo);
+        PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(list);
+        return ResultVOUtils.success(pageSimpleResponse);
     }
 
     /**
diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java
index 22d1578dc..ea72b557f 100644
--- a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java
@@ -85,7 +85,7 @@ public class DeviceRepairServiceImpl extends ServiceImpl<DeviceRepairMapper, Dev
                 .set(DeviceRepairEntity::getServiceLivePath, deviceRepairEntity.getServiceLivePath())
                 .set(DeviceRepairEntity::getUpdateTime,LocalDateTime.now())
                 .eq(DeviceRepairEntity::getId, repairId)
-                .eq(DeviceRepairEntity::getCreateUserId, user.getId())
+//                .eq(DeviceRepairEntity::getCreateUserId, user.getId())
                 .eq(DeviceRepairEntity::getFinishFlag, false)
         );
         if (updated && entity.getApplyId() != null) {