abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 调整工作流人员翻译查询

Browse Source
This commit is contained in:
gssong 2024-11-16 20:02:57 +08:00
parent 1b05bdf817
commit 22db22db48
9 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TaskAssigneeEnum.java
View File

@ -1,4 +1,4 @@
package org.dromara.workflow.common.enums;
package org.dromara.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

6
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
View File

@ -15,6 +15,8 @@ import org.dromara.common.core.enums.UserType;
import java.util.Set;
import static org.dromara.common.core.enums.TaskAssigneeEnum.USER;
/**
* 登录鉴权助手
* <p>
@ -89,10 +91,10 @@ public class LoginHelper {
}
/**
* 获取用户id
* 获取用户id(工作流使用)
*/
public static String getUserIdStr() {
return Convert.toStr(getExtra(USER_KEY));
return USER.getCode()+Convert.toStr(getExtra(USER_KEY));
}
/**

11
ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java
View File

@ -2,10 +2,16 @@ package org.dromara.common.translation.core.impl;
import lombok.AllArgsConstructor;
import org.dromara.common.core.service.UserService;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.translation.annotation.TranslationType;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.common.translation.core.TranslationInterface;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.dromara.common.core.enums.TaskAssigneeEnum.USER;
/**
* 用户名称翻译实现
*
@ -22,6 +28,11 @@ public class NicknameTranslationImpl implements TranslationInterface<String> {
if (key instanceof Long id) {
return userService.selectNicknameByIds(id.toString());
} else if (key instanceof String ids) {
if (StringUtils.isNotBlank(ids)) {
ids = Stream.of(ids.split(StringUtils.SEPARATOR))
.map(userId -> userId.contains(USER.getCode()) ? userId.replaceAll(USER.getCode(), StringUtils.EMPTY) : userId)
.collect(Collectors.joining(StringUtils.SEPARATOR));
}
return userService.selectNicknameByIds(ids);
}
return null;

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java
View File

@ -55,7 +55,7 @@ public enum TaskStatusEnum {
/**
* 委托
*/
PENDING("pending", "委托"),
DEPUTE("depute", "委托"),
/**
* 抄送

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java
View File

@ -34,7 +34,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import static org.dromara.workflow.common.enums.TaskAssigneeEnum.USER;
import static org.dromara.common.core.enums.TaskAssigneeEnum.USER;
/**
* 任务管理 控制层

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowStartListener.java
View File

@ -7,7 +7,7 @@ import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.warm.flow.core.dto.FlowParams;
import org.dromara.warm.flow.core.listener.Listener;
import org.dromara.warm.flow.core.listener.ListenerVariable;
import org.dromara.workflow.common.enums.TaskAssigneeEnum;
import org.dromara.common.core.enums.TaskAssigneeEnum;
import org.springframework.stereotype.Component;
import java.util.Collection;

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
View File

@ -52,7 +52,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import static org.dromara.workflow.common.constant.FlowConstant.*;
import static org.dromara.workflow.common.enums.TaskAssigneeEnum.USER;
import static org.dromara.common.core.enums.TaskAssigneeEnum.USER;
/**
* 任务 服务层实现

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskAssigneeServiceImpl.java
View File

@ -20,7 +20,7 @@ import org.dromara.warm.flow.ui.dto.HandlerQuery;
import org.dromara.warm.flow.ui.dto.TreeFunDto;
import org.dromara.warm.flow.ui.service.HandlerSelectService;
import org.dromara.warm.flow.ui.vo.HandlerSelectVo;
import org.dromara.workflow.common.enums.TaskAssigneeEnum;
import org.dromara.common.core.enums.TaskAssigneeEnum;
import org.dromara.workflow.service.IWfTaskAssigneeService;
import org.springframework.stereotype.Service;

4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
View File

@ -9,14 +9,14 @@ import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.warm.flow.core.entity.User;
import org.dromara.warm.flow.orm.entity.FlowUser;
import org.dromara.workflow.common.enums.TaskAssigneeEnum;
import org.dromara.common.core.enums.TaskAssigneeEnum;
import org.dromara.workflow.service.IWfTaskAssigneeService;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.dromara.workflow.common.enums.TaskAssigneeEnum.USER;
import static org.dromara.common.core.enums.TaskAssigneeEnum.USER;
/**
* 工作流工具