From 95a5f38112ac692d8e4620f7e66564a6f513127f Mon Sep 17 00:00:00 2001
From: luojing <13968186856@139.com>
Date: Tue, 9 Jun 2020 15:10:28 +0800
Subject: [PATCH] =?UTF-8?q?teamwork=E5=90=8E=E5=8F=B0=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../x/teamwork/assemble/control/jaxrs/chat/ActionCreate.java  | 1 +
 .../assemble/control/jaxrs/project/ActionRecovery.java        | 2 +-
 .../x/teamwork/assemble/control/service/DynamicService.java   | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/chat/ActionCreate.java b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/chat/ActionCreate.java
index 6b566ce521..6cbe98d25c 100644
--- a/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/chat/ActionCreate.java
+++ b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/chat/ActionCreate.java
@@ -76,6 +76,7 @@ public class ActionCreate extends BaseAction {
 					chat.setProjectId( task.getProject() );
 					chat.setProjectTitle( task.getProjectName() );
 					chat.setTaskTitle( task.getName() );
+					chat.setTarget(effectivePerson.getDistinguishedName());
 				}
 			} catch (Exception e) {
 				check = false;
diff --git a/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionRecovery.java b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionRecovery.java
index 87cd032218..e8de5be080 100644
--- a/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionRecovery.java
+++ b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionRecovery.java
@@ -54,7 +54,7 @@ public class ActionRecovery extends BaseAction {
 				result.setData( wo );
 			} catch (Exception e) {
 				check = false;
-				Exception exception = new ProjectPersistException(e, "项目图标信息更新时发生异常。");
+				Exception exception = new ProjectPersistException(e, "项目恢复时发生异常。");
 				result.error(exception);
 				logger.error(e, effectivePerson, request, null);
 			}
diff --git a/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/service/DynamicService.java b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/service/DynamicService.java
index bc039fc14e..479ce5159d 100644
--- a/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/service/DynamicService.java
+++ b/o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/service/DynamicService.java
@@ -419,9 +419,9 @@ class DynamicService {
 	private Dynamic composeNewDynamic( String objectType, String title, String description, String viewUrl, String optType, Chat object,  EffectivePerson effectivePerson, Boolean personal) {
 		Dynamic dynamic = composeNewSimpleDynamic(objectType, title, description, viewUrl, optType, effectivePerson, personal );
 		dynamic.setProjectId( object.getId() );
-		dynamic.setProjectTitle( "" );
+		dynamic.setProjectTitle( object.getProjectTitle() );
 		dynamic.setTaskId( object.getTaskId()  );
-		dynamic.setTaskTitle( "" );
+		dynamic.setTaskTitle( object.getTaskTitle() );
 		dynamic.setBundle( object.getId() );
 		dynamic.setTarget( object.getTarget() );
 		return dynamic;
-- 
GitLab