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-12-14 13:52:53 +08:00
parent 5e3de64805
commit 673984c482
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ public interface IFlwInstanceService {
/** /**
* 分页查询正在运行的流程实例 * 分页查询正在运行的流程实例
* *
* @param instance 参数 * @param flowInstanceBo 参数
* @param pageQuery 分页 * @param pageQuery 分页
* @return 结果 * @return 结果
*/ */
@ -30,7 +30,7 @@ public interface IFlwInstanceService {
/** /**
* 分页查询已结束的流程实例 * 分页查询已结束的流程实例
* *
* @param instance 参数 * @param flowInstanceBo 参数
* @param pageQuery 分页 * @param pageQuery 分页
* @return 结果 * @return 结果
*/ */

1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
View File

@ -119,6 +119,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getFlowCode()), "fd.flow_code", flowInstanceBo.getFlowCode()); queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getFlowCode()), "fd.flow_code", flowInstanceBo.getFlowCode());
queryWrapper.eq(StringUtils.isNotBlank(flowInstanceBo.getCategory()), "fd.category", flowInstanceBo.getCategory()); queryWrapper.eq(StringUtils.isNotBlank(flowInstanceBo.getCategory()), "fd.category", flowInstanceBo.getCategory());
queryWrapper.in(CollUtil.isNotEmpty(flowInstanceBo.getCreateByIds()), "fi.create_by", flowInstanceBo.getCreateByIds()); queryWrapper.in(CollUtil.isNotEmpty(flowInstanceBo.getCreateByIds()), "fi.create_by", flowInstanceBo.getCreateByIds());
queryWrapper.eq("fi.del_flag", "0");
queryWrapper.orderByDesc("fi.create_time"); queryWrapper.orderByDesc("fi.create_time");
return queryWrapper; return queryWrapper;
} }

1
ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml
View File

@ -47,7 +47,6 @@
fd.category fd.category
from flow_instance fi from flow_instance fi
left join flow_definition fd on fi.definition_id = fd.id left join flow_definition fd on fi.definition_id = fd.id
and fi.del_flag = '0'
${ew.getCustomSqlSegment} ${ew.getCustomSqlSegment}
</select> </select>