Merge branch 'fix_foton_20231213' into 'master'

fix: 监控流程查看,添加用户ID显示

See merge request laws-foton-slrs/foton-wkflow-rest!77
This commit is contained in:
高嵩
2024-01-19 09:44:05 +00:00
@@ -127,9 +127,9 @@ public class TaskController {
if(assignee.getData()!=null){
if (assignee.getData().getDisableFlag() == 1) {
historicTaskInstance.put("assignee", assignee.getData().getUname() + "(已禁用)");
historicTaskInstance.put("assignee", assignee.getData().getUname() + "("+ assignee.getData().getUsid() +")" + "(已禁用)");
} else{
historicTaskInstance.put("assignee", assignee.getData().getUname());
historicTaskInstance.put("assignee", assignee.getData().getUname() + "("+ assignee.getData().getUsid() +")");
}
historicTaskInstance.put("assigneeId", assignee.getData().getUsid());
QueryWrapper queryWrapper2 = new QueryWrapper();