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:
AprilWind 2024-12-02 11:02:34 +08:00
parent 2bdc297c6c
commit 0964226173
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ public enum TaskAssigneeEnum {
/** /**
* 用户 * 用户
*/ */
USER("用户", "user:"), USER("用户", ""),
/** /**
* 角色 * 角色

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

@ -8,6 +8,7 @@ import org.dromara.common.core.domain.dto.DeptDTO;
import org.dromara.common.core.domain.dto.TaskAssigneeDTO; import org.dromara.common.core.domain.dto.TaskAssigneeDTO;
import org.dromara.common.core.domain.dto.UserDTO; import org.dromara.common.core.domain.dto.UserDTO;
import org.dromara.common.core.domain.model.TaskAssigneeBody; import org.dromara.common.core.domain.model.TaskAssigneeBody;
import org.dromara.common.core.enums.TaskAssigneeEnum;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.service.DeptService; import org.dromara.common.core.service.DeptService;
import org.dromara.common.core.service.PostService; import org.dromara.common.core.service.PostService;
@ -20,7 +21,6 @@ import org.dromara.warm.flow.ui.dto.HandlerQuery;
import org.dromara.warm.flow.ui.dto.TreeFunDto; import org.dromara.warm.flow.ui.dto.TreeFunDto;
import org.dromara.warm.flow.ui.service.HandlerSelectService; import org.dromara.warm.flow.ui.service.HandlerSelectService;
import org.dromara.warm.flow.ui.vo.HandlerSelectVo; import org.dromara.warm.flow.ui.vo.HandlerSelectVo;
import org.dromara.common.core.enums.TaskAssigneeEnum;
import org.dromara.workflow.service.IWfTaskAssigneeService; import org.dromara.workflow.service.IWfTaskAssigneeService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -132,7 +132,7 @@ public class WfTaskAssigneeServiceImpl implements IWfTaskAssigneeService, Handle
public List<UserDTO> fetchUsersByStorageId(String storageId) { public List<UserDTO> fetchUsersByStorageId(String storageId) {
String[] parts = storageId.split(StrUtil.COLON, 2); String[] parts = storageId.split(StrUtil.COLON, 2);
if (parts.length < 2) { if (parts.length < 2) {
return Collections.emptyList(); return getUsersByType(TaskAssigneeEnum.USER, List.of(Long.valueOf(parts[0])));
} }
return getUsersByType(TaskAssigneeEnum.fromCode(parts[0] + StrUtil.COLON), List.of(Long.valueOf(parts[1]))); return getUsersByType(TaskAssigneeEnum.fromCode(parts[0] + StrUtil.COLON), List.of(Long.valueOf(parts[1])));
} }