From afb22090c509befbf68e7aaef00f06795d11337d Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期一, 07 二月 2022 17:49:29 +0800
Subject: [PATCH] 设备，外设单元修改
---
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java
index 5133b28..63ef9bd 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java
@@ -129,15 +129,19 @@
}
// 璁惧涓嶅瓨鍦ㄥ垯鏂板缓
else {
- // 鍏堟牴鎹簭鍒楃爜鐢熸垚搴忓垪鍙�
- DevEquipmentCode c = new DevEquipmentCode();
- c.setCreateTime(DateUtils.getNowDate());
- devEquipmentCodeMapper.insert(c);
- // 娣诲姞璁惧
- DevEquipment add = BeanUtil.toBean(bo, DevEquipment.class);
- add.setSerialNumber(c.getId());
- baseMapper.insert(add);
- return add;
+ if(bo.isRegister()) {
+ // 鍏堟牴鎹簭鍒楃爜鐢熸垚搴忓垪鍙�
+ DevEquipmentCode c = new DevEquipmentCode();
+ c.setCreateTime(DateUtils.getNowDate());
+ devEquipmentCodeMapper.insert(c);
+ // 娣诲姞璁惧
+ DevEquipment add = BeanUtil.toBean(bo, DevEquipment.class);
+ add.setSerialNumber(c.getId());
+ baseMapper.insert(add);
+ return add;
+ }else{
+ return po;
+ }
}
}
@@ -154,6 +158,9 @@
if (StringUtils.isNotBlank(bo.getHostId())) {
po.setHostId(bo.getHostId());
}
+ if(StringUtils.isNotBlank(bo.getEdition())){
+ po.setEdition(bo.getEdition());
+ }
// if (StringUtils.isEmpty(bo.getNetworkId())) {
// po.setNetworkId(bo.getNetworkId());
// }
--
Gitblit v1.9.1