Commit 9f761b05 authored by wdy's avatar wdy

Merge branch 'wangdingyi' into 'dev'

查看任务详情的小组成员

See merge request !252
parents 456fcd2a c1c6b940
...@@ -1018,10 +1018,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -1018,10 +1018,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
for (TaskUserRelation taskUserRelation : relation) { for (TaskUserRelation taskUserRelation : relation) {
if (Objects.equals(userRelation.getUserId(), taskUserRelation.getUserId())) { if (Objects.equals(userRelation.getUserId(), taskUserRelation.getUserId())) {
taskUserRelation.setStatus(userRelation.getStatus()); taskUserRelation.setStatus(userRelation.getStatus());
// 如果检验员状态为1,则显示已停用
if (Objects.equals(userRelation.getStatus(), TaskUserRelation.USER_STATUS_PROHIBIT)) {
taskUserRelation.setName(taskUserRelation.getName() + "(已停用)");
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment