Merge branch 'fix_foton_20231213' into 'master'

fix: 已发流程报错问题修改

See merge request laws-foton-slrs/foton-wkflow-rest!73
This commit is contained in:
高嵩
2023-12-18 02:32:11 +00:00
@@ -2463,9 +2463,9 @@ public class TodoTaskController extends BaseAction {
if (list2.size() > 0) { if (list2.size() > 0) {
for (Task task : list2) { for (Task task : list2) {
if (task.getAssignee() != null && !task.getAssignee().equals("")) { if (task.getAssignee() != null && !task.getAssignee().equals("")) {
ResponseMessage<UserVO> byId = lawsUserInfoService.getById(task.getAssignee()); ResponseMessage<UserVO> byId = lawsUserInfoService.getByIdFeignClientWithDisabled(task.getAssignee());
if (byId.getData() != null) { if (byId.getData().getUname() != null) {
if (assignee.indexOf(byId.getData().getUname()) == -1) { if (!assignee.contains(byId.getData().getUname())) {
assignee += ((byId.getData().getOrgName() != null && !byId.getData().getOrgName().equals("")) ? byId.getData().getOrgName() + "-" + byId.getData().getUname() : byId.getData().getUname()) + ","; assignee += ((byId.getData().getOrgName() != null && !byId.getData().getOrgName().equals("")) ? byId.getData().getOrgName() + "-" + byId.getData().getUname() : byId.getData().getUname()) + ",";
} }
} }