Просмотр исходного кода

update 优化 将返回值从bo改为vo

疯狂的狮子Li 10 месяцев назад
Родитель
Сommit
a4fb3fadaf

+ 36 - 0
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCopyVo.java

@@ -0,0 +1,36 @@
+package org.dromara.workflow.domain.vo;
+
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 抄送对象
+ *
+ * @author AprilWind
+ */
+@Data
+public class FlowCopyVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户名称
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "userId")
+    private String userName;
+
+    public FlowCopyVo(Long userId) {
+        this.userId = userId;
+    }
+
+}

+ 1 - 2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java

@@ -5,7 +5,6 @@ import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.warm.flow.core.entity.User;
 import org.dromara.workflow.common.constant.FlowConstant;
-import org.dromara.workflow.domain.bo.FlowCopyBo;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -192,7 +191,7 @@ public class FlowTaskVo implements Serializable {
      * <p>
      * 根据扩展属性中 CopySettingEnum 类型的数据生成,存储需要抄送的对象 ID
      */
-    private List<FlowCopyBo> copyList;
+    private List<FlowCopyVo> copyList;
 
     /**
      * 自定义参数 Map

+ 2 - 7
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java

@@ -46,6 +46,7 @@ import org.dromara.workflow.common.enums.TaskAssigneeType;
 import org.dromara.workflow.common.enums.TaskStatusEnum;
 import org.dromara.workflow.domain.FlowInstanceBizExt;
 import org.dromara.workflow.domain.bo.*;
+import org.dromara.workflow.domain.vo.FlowCopyVo;
 import org.dromara.workflow.domain.vo.FlowHisTaskVo;
 import org.dromara.workflow.domain.vo.FlowTaskVo;
 import org.dromara.workflow.domain.vo.NodeExtVo;
@@ -602,13 +603,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
         //设置按钮权限
         flowTaskVo.setButtonList(nodeExtVo.getButtonPermissions());
         if (CollUtil.isNotEmpty(nodeExtVo.getCopySettings())) {
-            List<FlowCopyBo> list = StreamUtils.toList(nodeExtVo.getCopySettings(), x -> {
-                FlowCopyBo bo = new FlowCopyBo();
-                Long id = Convert.toLong(x);
-                bo.setUserId(id);
-                bo.setUserName(userService.selectUserNameById(id));
-                return bo;
-            });
+            List<FlowCopyVo> list = StreamUtils.toList(nodeExtVo.getCopySettings(), x -> new FlowCopyVo(Convert.toLong(x)));
             flowTaskVo.setCopyList(list);
         } else {
             flowTaskVo.setCopyList(new ArrayList<>());