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-09-16 21:27:23 +08:00
parent 281c9c0e8e
commit 00522f3131
2 changed files with 4 additions and 4 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/service/impl/FlwTaskServiceImpl.java
View File

@ -202,6 +202,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
queryWrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowName()), "t.flow_name", flowTaskBo.getFlowName()); queryWrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowName()), "t.flow_name", flowTaskBo.getFlowName());
queryWrapper.eq(StringUtils.isNotBlank(flowTaskBo.getFlowCode()), "t.flow_code", flowTaskBo.getFlowCode()); queryWrapper.eq(StringUtils.isNotBlank(flowTaskBo.getFlowCode()), "t.flow_code", flowTaskBo.getFlowCode());
queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey());
queryWrapper.orderByDesc("t.create_time");
} }
/** /**
@ -238,7 +239,6 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
@Override @Override
public TableDataInfo<FlowTaskVo> getPageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { public TableDataInfo<FlowTaskVo> getPageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
QueryWrapper<FlowTaskBo> queryWrapper = new QueryWrapper<>(); QueryWrapper<FlowTaskBo> queryWrapper = new QueryWrapper<>();
queryWrapper.like(StringUtils.isNotBlank(flowTaskBo.getNodeName()), "t.node_name", flowTaskBo.getNodeName());
queryWrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowName()), "t.flow_name", flowTaskBo.getFlowName()); queryWrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowName()), "t.flow_name", flowTaskBo.getFlowName());
queryWrapper.eq(StringUtils.isNotBlank(flowTaskBo.getFlowCode()), "t.flow_code", flowTaskBo.getFlowCode()); queryWrapper.eq(StringUtils.isNotBlank(flowTaskBo.getFlowCode()), "t.flow_code", flowTaskBo.getFlowCode());
Page<FlowTaskVo> page = flwTaskMapper.getTaskCopyByPage(pageQuery.build(), queryWrapper); Page<FlowTaskVo> page = flwTaskMapper.getTaskCopyByPage(pageQuery.build(), queryWrapper);

6
ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml
View File

@ -104,20 +104,20 @@
<select id="getTaskCopyByPage" resultMap="FlowTaskResult"> <select id="getTaskCopyByPage" resultMap="FlowTaskResult">
select * from ( select * from (
SELECT SELECT
b.id ,
b.flow_status, b.flow_status,
b.business_id, b.business_id,
a.create_time, a.create_time,
b.node_name, b.node_name,
b.node_code, b.node_code,
b.id ,
d.flow_name, d.flow_name,
d.flow_code, d.flow_code
FROM FROM
`flow_user` a `flow_user` a
LEFT JOIN flow_instance b ON a.associated = b.id LEFT JOIN flow_instance b ON a.associated = b.id
LEFT JOIN flow_definition d on b.definition_id=d.id LEFT JOIN flow_definition d on b.definition_id=d.id
WHERE WHERE
a.type = 4 ORDER BY create_time DESC a.type = 4
) t ${ew.getCustomSqlSegment} ) t ${ew.getCustomSqlSegment}
</select> </select>
</mapper> </mapper>