From 6ee52a5f212a52b4a0d41bff3cddc519ddb66997 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 20 八月 2025 17:47:16 +0800 Subject: [PATCH] 修改bug --- pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java index c5a7395..11d6c51 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java @@ -6,7 +6,6 @@ import com.dy.common.webUtil.BaseResponseUtils; import com.dy.common.webUtil.ResultCodeMsg; import com.dy.pipIrrGlobal.pojoMd.MdEt0; -import com.dy.pipIrrGlobal.voRm.VoManure; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; @@ -20,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.List; /** @@ -75,7 +75,7 @@ */ @GetMapping(path = "oneCropsSomeEt0") @SsoAop() - public BaseResponse<List<VoManure>> oneCropsSomeEt0(VaporQo qo){ + public BaseResponse<List<MdEt0>> oneCropsSomeEt0(VaporQo qo){ try { if(qo.cropId == null){ return BaseResponseUtils.buildFail("浣滅墿id涓嶈兘涓虹┖") ; @@ -86,7 +86,11 @@ if(qo.timeStart == null || qo.timeStart.trim().equals("")){ qo.timeStart = DateTime.lastXDay_yyyy_MM_dd(qo.timeStop, 10); } - return BaseResponseUtils.buildSuccess(sv.oneCropsSomeEt0(qo)); + List<MdEt0> list = sv.oneCropsSomeEt0(qo) ; + if(list == null){ + list = new ArrayList<>() ; + } + return BaseResponseUtils.buildSuccess(list); } catch (Exception e) { return BaseResponseUtils.buildException(e.getMessage()) ; } -- Gitblit v1.8.0