DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix -- 重写前端选择审批用户模块，添加候选组功能（目前支持"角色"和"部门"）。流程图不兼容之前版本！

Browse Source
This commit is contained in:
konbai
2022-04-24 16:01:03 +08:00
parent 9295c85421
commit 6ad21a9c40
11 changed files with 668 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/constant/ProcessConstants.java
View File

@@ -60,11 +60,6 @@ public class ProcessConstants {
*/
public static final String PROCESS_CUSTOM_USER_TYPE = "userType";
/**
* 初始化人员
*/
public static final String PROCESS_INITIATOR = "INITIATOR";
/**
* 流程跳过

23
ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/constant/TaskConstants.java Normal file
View File

@@ -0,0 +1,23 @@
package com.ruoyi.flowable.common.constant;
/**
* @author konbai
* @createTime 2022/4/24 13:24
*/
public class TaskConstants {
/**
* 流程发起人
*/
public static final String PROCESS_INITIATOR = "initiator";
/**
* 角色候选组前缀
*/
public static final String ROLE_GROUP_PREFIX = "ROLE";
/**
* 部门候选组前缀
*/
public static final String DEPT_GROUP_PREFIX = "DEPT";
}

41
ruoyi-flowable/src/main/java/com/ruoyi/flowable/utils/TaskUtils.java Normal file
View File

@@ -0,0 +1,41 @@
package com.ruoyi.flowable.utils;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.flowable.common.constant.TaskConstants;
import java.util.ArrayList;
import java.util.List;
/**
* 工作流任务工具类
*
* @author konbai
* @createTime 2022/4/24 12:42
*/
public class TaskUtils {
public static String getUserId() {
return String.valueOf(LoginHelper.getUserId());
}
/**
* 获取用户组信息
*
* @return candidateGroup
*/
public static List<String> getCandidateGroup() {
List<String> list = new ArrayList<>();
LoginUser user = LoginHelper.getLoginUser();
if (ObjectUtil.isNotNull(user)) {
if (ObjectUtil.isNotEmpty(user.getRoles())) {
user.getRoles().forEach(role -> list.add(TaskConstants.ROLE_GROUP_PREFIX + role.getRoleId()));
}
if (ObjectUtil.isNotNull(user.getDeptId())) {
list.add(TaskConstants.DEPT_GROUP_PREFIX + user.getDeptId());
}
}
return list;
}
}