From 10de56ca16261e6a4eec49dfd32f0a6b232f7baf Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 19:05:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after

---
 framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
index bf88a10..4f60117 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
@@ -1,7 +1,6 @@
 package com.yuanchu.mom.utils;
 
 import com.yuanchu.mom.mapper.SystemLogMapper;
-import lombok.Builder;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -21,7 +20,7 @@
         String nums = num + "";
         if(nums.length() == 1) nums = "00" + num;
         else if(nums.length() == 2) nums = "0" + num;
-        return code + date2 + symbol + nums;
+        return code + (date2==null?date:date2) + symbol + nums;
     }
 
 }

--
Gitblit v1.9.3