diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java index 2c2c60e1b..3be1ef1e4 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java @@ -132,6 +132,11 @@ public class FlowTaskVo implements Serializable { @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "flowStatus", other = "wf_business_status") private String flowStatusName; + /** + * 办理人类型 + */ + private String type; + /** * 办理人ids */ @@ -148,9 +153,10 @@ public class FlowTaskVo implements Serializable { private String processedBy; /** - * 办理人类型 + * 抄送人名称 */ - private String type; + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "processedBy") + private String processedByName; /** * 流程签署比例值 大于0为票签,会签 @@ -158,12 +164,12 @@ public class FlowTaskVo implements Serializable { private BigDecimal nodeRatio; /** - * 创建者 + * 申请人id */ private String createBy; /** - * 申请人 + * 申请人名称 */ @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy") private String createByName; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java index 9aaccd698..0a5c0bb54 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java @@ -65,6 +65,9 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService { @Cacheable(cacheNames = FlowConstant.FLOW_CATEGORY_NAME, key = "#categoryId") @Override public String selectCategoryNameById(String categoryId) { + if (StringUtils.isBlank(categoryId)) { + return null; + } FlowCategory category = baseMapper.selectOne(new LambdaQueryWrapper() .select(FlowCategory::getCategoryName).eq(FlowCategory::getCategoryId, categoryId)); return ObjectUtils.notNullGetter(category, FlowCategory::getCategoryName);