Skip to content

Commit 7200ee2

Browse files
committed
Merge remote-tracking branch 'origin/develop' into CLAP-451
# Conflicts: # src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
2 parents c137060 + 70a6dc2 commit 7200ee2

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/main/java/clap/server/application/service/task/ApprovalTaskService.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,7 @@ public FindApprovalFormResponse findApprovalForm(Long managerId, Long taskId) {
7878

7979
private void publishNotification(Task task, String processorName) {
8080
List<Member> receivers = new ArrayList<>();
81-
receivers.add(task.getRequester());
82-
83-
if (!task.getRequester().getMemberId().equals(task.getProcessor().getMemberId())) {
84-
receivers.add(task.getProcessor());
85-
}
81+
receivers.add(task.getProcessor());
8682

8783
receivers.forEach(receiver -> {
8884
boolean isManager = receiver.getMemberInfo().getRole() == MemberRole.ROLE_MANAGER;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
alter table task_history
2+
modify modified_status varchar(40) null;

0 commit comments

Comments
 (0)