1.0.66 模板变量查询优化

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<List<TemplateVariableAssignVo>> assignTemplateVariables(@Validated @RequestBody TemplateVariableAssignRequest request) {
         List<TemplateVariableAssignVo> result = templateVariableAssignService.assignTemplateVariables(request);

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<BaseTemplateVariable> buildQueryWrapper(BaseTemplateVariableBo bo) {
         MPJLambdaWrapper<BaseTemplateVariable> 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;
     }