朱园亮 / xingyun-erp · Commits

Commit 473dd986dfa87be9826884b3a399ca31981a896c

Authored by 杨鸣坤
1 parent 94de413d

楚江ERP：修复无权限不展示锁规延期问题

Inline Side-by-side
Showing 2 changed files with 3 additions and 1 deletions
@@ -82,8 +82,9 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL @@ -82,8 +82,9 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
82 // 获取当前人员的待办任务数据 82 // 获取当前人员的待办任务数据
83 List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId()); 83 List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
84 if (CollectionUtils.isEmpty(flowTaskList)) { 84 if (CollectionUtils.isEmpty(flowTaskList)) {
85 - return new PageResult<>(); 85 + return PageResultUtil.convert(new PageInfo<>(datas));
86 } 86 }
  87 +
87 List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList()); 88 List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
88 for (SpecLockDelayApplication specLockDelayApplication : datas) { 89 for (SpecLockDelayApplication specLockDelayApplication : datas) {
89 specLockDelayApplication.setShowExamine(ids.contains(specLockDelayApplication.getId())); 90 specLockDelayApplication.setShowExamine(ids.contains(specLockDelayApplication.getId()));
@@ -53,6 +53,7 @@ @@ -53,6 +53,7 @@
53 </foreach> 53 </foreach>
54 </if> 54 </if>
55 </where> 55 </where>
  56 + order by create_time desc
56 </select> 57 </select>
57 58
58 <select id="selectLatestPassedByContractIds" resultMap="SpecLockDelayApplication"> 59 <select id="selectLatestPassedByContractIds" resultMap="SpecLockDelayApplication">