From f7a2fcdda7f1120498c5c5f75c5a99955fc54b43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 十二月 2025 16:54:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDataService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 4d98c89..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
@@ -34,7 +34,6 @@
//鍒涘缓List瀵硅薄
orderBasicDataMap = getBasicDataByType("order");
-
//鑾峰彇瀹㈡埛鍒楄〃
List<Object> orderBasicDataList = new ArrayList<>();
orderBasicDataMap.put("customer",orderBasicDataList);
@@ -137,18 +136,21 @@
public boolean addBasicData(Map<String, Object> map) {
List<String> basicTypeList = (List<String>) map.get("basicType");
if(basicTypeList.size()==2){
+ Integer maxSort = basicDataMapper.getBasicDataMaxSort(basicTypeList.get(1));
BasicData basicData = new BasicData();
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);
}
return true;
}
public int deleteBasicData(BasicData basicData) {
-
return basicDataMapper.deleteById(basicData.getId());
}
--
Gitblit v1.8.0