Commit eaeb04c2 authored by 盖献康's avatar 盖献康

Merge branch 'dev' of...

Merge branch 'dev' of ssh://gitlab.91isoft.com:10022/wangfei/vehicle-quality-review into gaixiankang
parents 23035a90 9f761b05
...@@ -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