!779 发布 5.5.1 正式版 日常依赖升级bug修复

Merge pull request !779 from 疯狂的狮子Li/dev

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java

@@ -67,8 +67,7 @@ public class CompleteTaskDTO implements Serializable {
 
     public Map<String, Object> getVariables() {
         if (variables == null) {
-            variables = new HashMap<>(16);
+            return new HashMap<>(16);
-            return variables;
         }
         variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
         return variables;

ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDynamicOptions.java

@@ -1,20 +0,0 @@
-package org.dromara.common.excel.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * Excel动态下拉选项注解
- *
- * @author Angus
- */
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-public @interface ExcelDynamicOptions {
-
-    /**
-     * 提供者类全限定名
-     * 实现org.dromara.common.excel.service.ExcelOptionsProvider实现类接口
-     */
-    Class<?> providerClass();
-}

ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java

@@ -23,9 +23,7 @@ import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.annotation.ExcelDynamicOptions;
 import org.dromara.common.excel.annotation.ExcelEnumFormat;
-import org.dromara.common.excel.service.ExcelOptionsProvider;
 
 import java.lang.reflect.Field;
 import java.util.*;
@@ -119,18 +117,6 @@ public class ExcelDownHandler implements SheetWriteHandler {
                 ExcelEnumFormat format = field.getDeclaredAnnotation(ExcelEnumFormat.class);
                 List<Object> values = EnumUtil.getFieldValues(format.enumClass(), format.textField());
                 options = StreamUtils.toList(values, Convert::toStr);
-            } else if (field.isAnnotationPresent(ExcelDynamicOptions.class)) {
-                // 处理动态下拉选项
-                ExcelDynamicOptions dynamicOptions = field.getDeclaredAnnotation(ExcelDynamicOptions.class);
-                Class<?> providerClass = dynamicOptions.providerClass();
-                if (providerClass == null) {
-                    throw new ServiceException("使用ExcelDynamicOptions注解，必须给providerClass赋予ExcelOptionsProvider的实现类" +
-                        "，字段：{}", field.getName());
-                }
-                // 获取提供者实例
-                ExcelOptionsProvider provider = (ExcelOptionsProvider) SpringUtils.getBean(providerClass);
-                Set<String> optionSets = provider.getOptions();
-                options = new ArrayList<>(CollUtil.isNotEmpty(optionSets) ? new ArrayList<>(optionSets) : Collections.emptyList());
             }
             if (ObjectUtil.isNotEmpty(options)) {
                 // 仅当下拉可选项不为空时执行

ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/service/ExcelOptionsProvider.java

@@ -1,18 +0,0 @@
-package org.dromara.common.excel.service;
-
-import java.util.Set;
-
-/**
- * Excel下拉选项数据提供接口
- *
- * @author Angus
- */
-public interface ExcelOptionsProvider {
-
-    /**
-     * 获取下拉选项数据
-     *
-     * @return 下拉选项列表
-     */
-    Set<String> getOptions();
-}

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java

@@ -144,8 +144,7 @@ public class WorkflowGlobalListener implements GlobalListener {
         //申请人提交事件
         Boolean submit = MapUtil.getBool(variable, FlowConstant.SUBMIT);
         if (submit != null && submit) {
-            String status = determineFlowStatus(instance);
+            flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, instance.getFlowStatus(), variable, true);
-            flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, status, variable, true);
         } else {
             // 判断流程状态（发布：撤销，退回，作废，终止，已完成事件）
             String status = determineFlowStatus(instance);

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java

@@ -199,10 +199,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
                 testLeave.setApplyCode(businessCode);
             }
             testLeave.setStatus(BusinessStatusEnum.WAITING.getStatus());
-            log.info("申请人提交");
         }
-        String status = BusinessStatusEnum.findByStatus(processEvent.getStatus());
-        log.info("当前流程状态为{}", status);
         baseMapper.updateById(testLeave);
     }
 

script/sql/sqlserver/sqlserver_ry_workflow.sql

@@ -1261,7 +1261,7 @@ EXEC sp_addextendedproperty
     'COLUMN', N'component_name'
 GO
 
-EXEC sp_addextendedproperty
+-- method_name 字段注释
     'MS_Description', N'方法名',
     'SCHEMA', N'dbo',
     'TABLE', N'flow_spel',