From 7e5b8bd1957aecfe8b684feedad22992b539d060 Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Fri, 15 Dec 2023 17:45:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(material):=20=E4=BF=AE=E5=A4=8D=E6=9D=90?=
 =?UTF-8?q?=E6=96=99=E7=BC=96=E7=A0=81=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/mjkf/xinke/main/controller/MaterialController.java    | 2 +-
 src/main/java/mjkf/xinke/main/service/MaterialService.java     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/mjkf/xinke/main/controller/MaterialController.java b/src/main/java/mjkf/xinke/main/controller/MaterialController.java
index 491c237..63ab4e3 100644
--- a/src/main/java/mjkf/xinke/main/controller/MaterialController.java
+++ b/src/main/java/mjkf/xinke/main/controller/MaterialController.java
@@ -144,7 +144,7 @@ public class MaterialController {
         query.orderByDesc(Material::getId);
         var data = materialService.list(query);
         String maxBrotherId;
-        if (data == null) {
+        if (data == null || data.size() == 0) {
             maxBrotherId = null;
         } else {
             maxBrotherId = data.get(0).getId();
diff --git a/src/main/java/mjkf/xinke/main/service/MaterialService.java b/src/main/java/mjkf/xinke/main/service/MaterialService.java
index 6c7c583..9d3aec8 100644
--- a/src/main/java/mjkf/xinke/main/service/MaterialService.java
+++ b/src/main/java/mjkf/xinke/main/service/MaterialService.java
@@ -11,6 +11,9 @@ public class MaterialService extends ServiceImpl<BaseMapper<Material>, Material>
         String prefix;
         String suffix;
         String previous;
+        if (maxBrotherId == null) {
+            maxBrotherId = "60.60.60.60";
+        }
         if (parentId.contains("00.00.00.00")) {
             prefix = "";
             suffix = ".00.00.00";