From 9b3d5e47568ac430a7a544297cfa7d1a77186e86 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期五, 31 十二月 2021 17:34:20 +0800
Subject: [PATCH] 配置工具修改
---
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 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..740091a 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;
+ }
}
}
--
Gitblit v1.9.1