From d1bcbbefab4da603c275ed61d0018a46dbc67d1e Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期三, 12 十月 2022 16:31:51 +0800
Subject: [PATCH] 施工交付增加其他录入交付功能
---
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgIpcServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgIpcServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgIpcServiceImpl.java
index 203eda0..46b03bd 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgIpcServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgIpcServiceImpl.java
@@ -74,9 +74,11 @@
if (list.size() > 0) {
throw new ServiceException("MAC閲嶅", HttpStatus.HTTP_PARTIAL);
}
- SgNvr nvr = nvrMapper.selectById(bo.getNvrId());
- if (!bo.getOrganizationId().equals(nvr.getOrganizationId())) {
- throw new ServiceException("IPC鎵�灞炲崟浣嶄笌鎵�閫塏VR鎵�灞炲崟浣嶄笉绗�", HttpStatus.HTTP_PARTIAL);
+ if (null != bo.getNvrId()) {
+ SgNvr nvr = nvrMapper.selectById(bo.getNvrId());
+ if (!bo.getOrganizationId().equals(nvr.getOrganizationId())) {
+ throw new ServiceException("IPC鎵�灞炲崟浣嶄笌鎵�閫塏VR鎵�灞炲崟浣嶄笉绗�", HttpStatus.HTTP_PARTIAL);
+ }
}
SgIpc add = BeanUtil.toBean(bo, SgIpc.class);
validEntityBeforeSave(add);
@@ -97,9 +99,11 @@
if (list.size() > 0) {
throw new ServiceException("MAC閲嶅", HttpStatus.HTTP_PARTIAL);
}
- SgNvr nvr = nvrMapper.selectById(bo.getNvrId());
- if (!bo.getOrganizationId().equals(nvr.getOrganizationId())) {
- throw new ServiceException("IPC鎵�灞炲崟浣嶄笌鎵�閫塏VR鎵�灞炲崟浣嶄笉绗�", HttpStatus.HTTP_PARTIAL);
+ if (null != bo.getNvrId()) {
+ SgNvr nvr = nvrMapper.selectById(bo.getNvrId());
+ if (!bo.getOrganizationId().equals(nvr.getOrganizationId())) {
+ throw new ServiceException("IPC鎵�灞炲崟浣嶄笌鎵�閫塏VR鎵�灞炲崟浣嶄笉绗�", HttpStatus.HTTP_PARTIAL);
+ }
}
SgIpc update = BeanUtil.toBean(bo, SgIpc.class);
validEntityBeforeSave(update);
--
Gitblit v1.9.1