Commit 8f65503c by zhu.zewen

修复单号生成

parent 68f40772
......@@ -314,7 +314,7 @@ public abstract class BaseService {
* @param expression
* @return
*/
public static Object calculateSpel(Object target, String expression) {
protected Object calculateSpel(Object target, String expression) {
if (ObjectUtil.isEmpty(target) || ObjectUtil.isEmpty(expression)) {
return null;
}
......
......@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jmai.api.base.BaseService;
import com.jmai.api.exception.ServiceException;
import com.jmai.sys.consts.enums.SysFileTypeEnum;
import com.jmai.sys.dto.*;
......@@ -31,17 +32,14 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
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.nextShotId;
import static com.jmai.sys.consts.ConfigTypes.IVS_CODE_GENERATOR;
import static com.jmai.sys.consts.ConfigTypes.IvsCodeGenerator.*;
@Slf4j
@Component
public class SysManager {
public class SysManager extends BaseService {
@Resource
private ConfigService configService;
@Resource
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment