From 62fc5c26cf9a96eeefc4aff8590349ba75913006 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期二, 13 九月 2022 10:40:36 +0800
Subject: [PATCH] 配置工具修改
---
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgIpcServiceImpl.java | 21 +++++++++++++++------
1 files changed, 15 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 16bf05f..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
@@ -19,6 +19,7 @@
import com.ruoyi.oa.domain.SgIpc;
import com.ruoyi.oa.mapper.SgIpcMapper;
import com.ruoyi.oa.service.ISgIpcService;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
@@ -61,19 +62,23 @@
lqw.eq(bo.getOrganizationId() != null, SgIpc::getOrganizationId, bo.getOrganizationId());
lqw.eq(bo.getConstructionBatchId() != null, SgIpc::getConstructionBatchId, bo.getConstructionBatchId());
lqw.like(StringUtils.isNotBlank(bo.getModel()), SgIpc::getModel, bo.getModel());
+ lqw.orderByDesc(SgIpc::getUpdateTime);
return lqw;
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(SgIpcBo bo) {
List<SgIpc> list = baseMapper.selectList(new LambdaQueryWrapper<SgIpc>()
.eq(SgIpc::getSchoolId, bo.getSchoolId()).eq(SgIpc::getMac, bo.getMac()));
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);
@@ -85,6 +90,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Boolean updateByBo(SgIpcBo bo) {
List<SgIpc> list = baseMapper.selectList(new LambdaQueryWrapper<SgIpc>()
.eq(SgIpc::getSchoolId, bo.getSchoolId())
@@ -93,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);
@@ -112,6 +120,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
//TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
--
Gitblit v1.9.1