From 182c5e971e633ee4b56433b16678aee632b77c52 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 2 Feb 2026 16:58:22 +0800 Subject: [PATCH] =?UTF-8?q?1.0.66=20=E6=A8=A1=E6=9D=BF=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseTemplateVariableController.java | 2 +- .../impl/BaseTemplateVariableServiceImpl.java | 23 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseTemplateVariableController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseTemplateVariableController.java index 2e8a2b3d..2d69b575 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseTemplateVariableController.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseTemplateVariableController.java @@ -39,6 +39,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class BaseTemplateVariableController extends BaseController { private final IBaseTemplateVariableService baseTemplateVariableService; + private final ITemplateVariableAssignService templateVariableAssignService; /** @@ -123,7 +124,6 @@ public class BaseTemplateVariableController extends BaseController { * @param request 赋值请求（包含模板类型、合同ID） * @return 赋值后的模板变量列表 */ -// @SaCheckPermission("oa/base:templateVariable:assign") @PostMapping("/assign") public R> assignTemplateVariables(@Validated @RequestBody TemplateVariableAssignRequest request) { List result = templateVariableAssignService.assignTemplateVariables(request); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseTemplateVariableServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseTemplateVariableServiceImpl.java index c7c16748..240150b5 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseTemplateVariableServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseTemplateVariableServiceImpl.java @@ -69,17 +69,18 @@ public class BaseTemplateVariableServiceImpl implements IBaseTemplateVariableSer private MPJLambdaWrapper buildQueryWrapper(BaseTemplateVariableBo bo) { MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseTemplateVariable.class) - .selectAll(BaseTemplateVariable.class) - .eq(StringUtils.isNotBlank(bo.getVarLabel()), BaseTemplateVariable::getVarLabel, bo.getVarLabel()) - .like(StringUtils.isNotBlank(bo.getVarName()), BaseTemplateVariable::getVarName, bo.getVarName()) - .eq(StringUtils.isNotBlank(bo.getTemplateType()), BaseTemplateVariable::getTemplateType, bo.getTemplateType()) - .eq(StringUtils.isNotBlank(bo.getDataSource()), BaseTemplateVariable::getDataSource, bo.getDataSource()) - .eq(StringUtils.isNotBlank(bo.getDataField()), BaseTemplateVariable::getDataField, bo.getDataField()) - .eq(StringUtils.isNotBlank(bo.getVarType()), BaseTemplateVariable::getVarType, bo.getVarType()) - .eq(StringUtils.isNotBlank(bo.getDefaultValue()), BaseTemplateVariable::getDefaultValue, bo.getDefaultValue()) - .eq(bo.getSortOrder() != null, BaseTemplateVariable::getSortOrder, bo.getSortOrder()) - .eq(bo.getTemplateId() != null, BaseTemplateVariable::getTemplateId, bo.getTemplateId()) - .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseTemplateVariable::getActiveFlag, bo.getActiveFlag()); + .selectAll(BaseTemplateVariable.class) + .eq(StringUtils.isNotBlank(bo.getVarLabel()), BaseTemplateVariable::getVarLabel, bo.getVarLabel()) + .like(StringUtils.isNotBlank(bo.getVarName()), BaseTemplateVariable::getVarName, bo.getVarName()) + .eq(StringUtils.isNotBlank(bo.getTemplateType()), BaseTemplateVariable::getTemplateType, bo.getTemplateType()) + .eq(StringUtils.isNotBlank(bo.getDataSource()), BaseTemplateVariable::getDataSource, bo.getDataSource()) + .eq(StringUtils.isNotBlank(bo.getDataField()), BaseTemplateVariable::getDataField, bo.getDataField()) + .eq(StringUtils.isNotBlank(bo.getVarType()), BaseTemplateVariable::getVarType, bo.getVarType()) + .eq(StringUtils.isNotBlank(bo.getDefaultValue()), BaseTemplateVariable::getDefaultValue, bo.getDefaultValue()) + .eq(bo.getSortOrder() != null, BaseTemplateVariable::getSortOrder, bo.getSortOrder()) + .eq(bo.getTemplateId() != null, BaseTemplateVariable::getTemplateId, bo.getTemplateId()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseTemplateVariable::getActiveFlag, bo.getActiveFlag()) + .orderByAsc(BaseTemplateVariable::getTemplateType, BaseTemplateVariable::getSortOrder); return lqw; }