From def672ad751adb6c08c388ba065e395c74de6c4e Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期四, 16 十一月 2023 10:16:08 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java
index 1e8d274..f909e53 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java
@@ -4,10 +4,12 @@
import com.github.pagehelper.PageInfo;
import com.thhy.general.common.BasicResult;
import com.thhy.general.config.SysUserInfo;
+import com.thhy.general.utils.UUIDUtils;
import com.thhy.general.utils.UserInfoUtils;
import com.thhy.materials.modules.biz.suMaterialWarehouse.entity.SuMaterialWarehouseEntity;
import com.thhy.materials.modules.biz.suMaterialWarehouse.mapper.SuMaterialWarehouseMapper;
import com.thhy.materials.modules.biz.suMaterialWarehouse.service.SuMaterialWarehouseService;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -30,11 +32,12 @@
SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
String companyId = sysUserInfo.getCompanyId();
String userId = sysUserInfo.getUserId();
- Integer id = suMaterialWarehouseEntity.getId();
- if(id != null){
+ String id = suMaterialWarehouseEntity.getId();
+ if(StringUtils.isNotBlank(id)){
suMaterialWarehouseEntity.setUpdateTime(new Date());
suMaterialWarehouseEntity.setUpdateUser(userId);
}
+ suMaterialWarehouseEntity.setId(UUIDUtils.create());
suMaterialWarehouseEntity.setCreateUser(userId);
suMaterialWarehouseEntity.setCompanyId(companyId);
suMaterialWarehouseMapper.insertAndUpdate(suMaterialWarehouseEntity);
--
Gitblit v1.9.3