From f8a708d9d960db750c9dd029efbe4a9f63d53fe8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 25 四月 2025 13:51:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPWarnMsgAdptInfoController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPWarnMsgAdptInfoController.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPWarnMsgAdptInfoController.java
index 8ee19d0..a7aca3c 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPWarnMsgAdptInfoController.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPWarnMsgAdptInfoController.java
@@ -82,8 +82,11 @@
@PostMapping("/findByInfoId")
public R<UPWarnMsgAdptInfoVo> findByInfoId(@RequestParam("infoId") Integer infoId) {
UPWarnMsgAdptInfo warnMsgAdptInfo = upWarnMsgAdptInfoDao.findByInfoIdIs(infoId);
- UPWarnMsgAdptInfoVo vo = new UPWarnMsgAdptInfoVo();
- BeanUtils.copyProperties(warnMsgAdptInfo, vo);
- return R.ok(vo);
+ if(null != warnMsgAdptInfo){
+ UPWarnMsgAdptInfoVo vo = new UPWarnMsgAdptInfoVo();
+ BeanUtils.copyProperties(warnMsgAdptInfo, vo);
+ return R.ok(vo);
+ }
+ return R.ok();
}
}
--
Gitblit v1.7.1