From d21b141e59c9994a51349982a255b3b4b42f3e9b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 02 八月 2024 12:04:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicGlassTypeService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicGlassTypeService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicGlassTypeService.java
index 779dd52..307bc6a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicGlassTypeService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicGlassTypeService.java
@@ -84,7 +84,13 @@
basicGlassTypeS.setTypeName((String) map.get("value"));
}else if(list.size()==2) {
BasicGlassType basicGlassType = basicGlassTypeMapper.selectMaxTowLevelType((String) list.get(1));
- int maxId = Integer.parseInt(basicGlassType.getTypeId().substring(2));
+ Integer maxId = null;
+ if(basicGlassType==null){
+ maxId = 0;
+ }else {
+ maxId = Integer.parseInt(basicGlassType.getTypeId().substring(2));
+ }
+
String newTypeId =list.get(1) + String.format("%02d", maxId+1);
basicGlassTypeS.setLevel((Integer) list.get(0));
basicGlassTypeS.setTypeId(newTypeId);
--
Gitblit v1.8.0