修复单号生成

jmai-api/src/main/java/com/jmai/api/base/BaseService.java

@@ -314,7 +314,7 @@ public abstract class BaseService {
      * @param expression
      * @param expression
      * @return
      * @return
      */
      */
-    public static Object calculateSpel(Object target, String expression) {
+    protected Object calculateSpel(Object target, String expression) {
         if (ObjectUtil.isEmpty(target) || ObjectUtil.isEmpty(expression)) {
         if (ObjectUtil.isEmpty(target) || ObjectUtil.isEmpty(expression)) {
             return null;
             return null;
         }
         }

jmai-sys/src/main/java/com/jmai/sys/manager/SysManager.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jmai.api.base.BaseService;
 import com.jmai.api.exception.ServiceException;
 import com.jmai.api.exception.ServiceException;
 import com.jmai.sys.consts.enums.SysFileTypeEnum;
 import com.jmai.sys.consts.enums.SysFileTypeEnum;
 import com.jmai.sys.dto.*;
 import com.jmai.sys.dto.*;
@@ -31,17 +32,14 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.IntStream;
 
 
 import static cn.hutool.core.date.DatePattern.NORM_DATE_PATTERN;
 import static cn.hutool.core.date.DatePattern.NORM_DATE_PATTERN;
-import static com.jmai.api.base.BaseService.calculateSpel;
-import static com.jmai.api.base.BaseService.toJSONString;
 import static com.jmai.sys.AbstractService.nextId;
 import static com.jmai.sys.AbstractService.nextId;
 import static com.jmai.sys.AbstractService.nextShotId;
 import static com.jmai.sys.AbstractService.nextShotId;
 import static com.jmai.sys.consts.ConfigTypes.IVS_CODE_GENERATOR;
 import static com.jmai.sys.consts.ConfigTypes.IVS_CODE_GENERATOR;
-import static com.jmai.sys.consts.ConfigTypes.IvsCodeGenerator.*;
 
 
 
 
 @Slf4j
 @Slf4j
 @Component
 @Component
-public class SysManager {
+public class SysManager extends BaseService {
     @Resource
     @Resource
     private ConfigService configService;
     private ConfigService configService;
     @Resource
     @Resource