@@ -17,6 +17,7 @@ import com.jfireel.expression.token.Token;
import com.jfireel.expression.token.TokenType;
import org.apache.commons.collections4.MapUtils;
import org.apache.poi.ss.formula.functions.T;
+import org.checkerframework.checker.units.qual.A;
import org.springblade.core.tool.utils.CharPool;
import org.springblade.core.tool.utils.CollectionUtil;
import org.springblade.core.tool.utils.Func;
@@ -771,6 +772,8 @@ public class CustomFunction {
+
/**
* 判断value是否存在range范围内
* @param value
@@ -342,7 +342,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
});
stopWatch.start("公式处理");
List<Formula> formulas = this.formulaService.getFormulaList(keyMappers);
- WbsTreeContract wtc = this.wbsTreeContractService.getById(nodeId);
+ WbsTreeContract wtc = this.wbsTreeContractService.getOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getPKeyId,nodeId));
TableElementConverter tec = new TableElementConverter(tableInfoList, keyMappers, formulas, coordinateMap, wtc);
if (tec.isPresent()) {
tec.before();