From b0a4de74b47e2626f51eb4a844db3e62f6a4bf9d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 十二月 2025 10:52:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDataService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDataService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDataService.java
index b4146fa..4e51d6d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDataService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDataService.java
@@ -141,7 +141,9 @@
basicData.setBasicType(basicTypeList.get(0));
basicData.setBasicCategory(basicTypeList.get(1));
basicData.setBasicName(map.get("input").toString());
- basicData.setNickname(map.get("nickname").toString());
+ if(map.get("nickname")!=null){
+ basicData.setNickname(map.get("nickname").toString());
+ }
basicData.setSort(maxSort+1);
basicDataMapper.insert(basicData);
}
--
Gitblit v1.8.0