fix(todo): 修复待办事项当前处理人显示逻辑
- 修改状态判断条件从不等于2改为小于2 - 添加来源类型判断分支 - 当来源类型为0时显示创建人姓名作为当前处理人 - 保持原有逻辑处理非0来源类型的查询方式
This commit is contained in:
parent
52cb2fd57b
commit
d476cdf74a
|
|
@ -34,7 +34,10 @@ public class QmsIssueTicketTodoControllerService {
|
||||||
if (CollectionUtil.isNotEmpty(pageData.getRecords())) {
|
if (CollectionUtil.isNotEmpty(pageData.getRecords())) {
|
||||||
pageData.getRecords().forEach(item -> {
|
pageData.getRecords().forEach(item -> {
|
||||||
item.setIsRead(true);
|
item.setIsRead(true);
|
||||||
if (item.getStatus() != 2) {
|
if (item.getStatus() < 2) {
|
||||||
|
if (item.getSourceType() == 0) {
|
||||||
|
item.setCurrentHandleUserName(item.getCreateUserName());
|
||||||
|
} else {
|
||||||
item.setCurrentHandleUserName(
|
item.setCurrentHandleUserName(
|
||||||
StrUtil.join(",",
|
StrUtil.join(",",
|
||||||
issueTicketProcessService.lambdaQuery()
|
issueTicketProcessService.lambdaQuery()
|
||||||
|
|
@ -45,9 +48,9 @@ public class QmsIssueTicketTodoControllerService {
|
||||||
.map(QmsIssueTicketProcess::getHandlerUserName)
|
.map(QmsIssueTicketProcess::getHandlerUserName)
|
||||||
.toList()
|
.toList()
|
||||||
)
|
)
|
||||||
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return pageData;
|
return pageData;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue