From cb19937239b42f51c6e8525450d08e93225117bc Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期三, 14 五月 2025 13:16:02 +0800
Subject: [PATCH] 新增部分移动端接口
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java
index 781ab33..dd6e024 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java
@@ -69,13 +69,18 @@
if(reqVo.getEquId()!=null){
EimsEquVo equVo = equMapper.selectVoById(reqVo.getEquId());
- resVo.setAssetNo(equVo.getAssetNo());
- resVo.setEquName(equVo.getEquName());
+ if(equVo!=null){
+ resVo.setAssetNo(equVo.getAssetNo());
+ resVo.setEquName(equVo.getEquName());
+ }
+
}
if(reqVo.getFixtureId()!=null){
EimsFixtureVo fixtureVo = fixtureMapper.selectVoById(reqVo.getFixtureId());
- resVo.setFixtureName(fixtureVo.getFixtureName());
- resVo.setAssetNo(fixtureVo.getAssetNo());
+ if(fixtureVo!=null){
+ resVo.setFixtureName(fixtureVo.getFixtureName());
+ resVo.setAssetNo(fixtureVo.getAssetNo());
+ }
}
@@ -296,6 +301,7 @@
qw.eq(bo.getResUser() != null, "res.res_user", bo.getResUser());
qw.eq(bo.getReqType() != null, "req.req_type", bo.getReqType());
qw.eq(bo.getReqUser() != null, "res.req_user", bo.getReqUser());
+ qw.eq(bo.getAssetNo() != null, "equ.asset_no", bo.getAssetNo());
List<Long> resDeptIds = getAllDescendantIds(bo.getResDept());
qw.in(bo.getResDept() != null, "res.res_dept", resDeptIds);
--
Gitblit v1.9.3