From 64463005c0cc965d6fe85235934993f5da0d12b5 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 26 Oct 2020 16:39:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=A1=88=E4=B9=9F?=
 =?UTF-8?q?=E8=A6=81=E7=BB=99=E8=BD=AC=E9=A1=B9=E7=9B=AE=E4=BA=BA=E5=8F=91?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/ProjectServiceImpl.java  | 4 ++--
 .../src/main/resources/mapper/ProjectStaffDao.xml             | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 07c346b1c8..e2d8270046 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -403,7 +403,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			msgList.add(messageFormDTO);
 			WxSubscribeMessageFormDTO msg = new WxSubscribeMessageFormDTO();
 			msg.setCustomerId(projectEntity.getCustomerId());
-			msg.setClientType(AppClientConstant.APP_GOV);
+			msg.setClientType(p.getApp());
 			msg.setUserId(p.getUserId());
 			msg.setBehaviorType("项目消息");
 			msg.setMessageContent(String.format(UserMessageConstant.PROJECT_CLOSED_MSG, projectEntity.getTitle(), fromDTO.getPublicReply()));
@@ -433,7 +433,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			wxmpMsgList.add(msg);
 		});
 		messageFeignClient.saveUserMessageList(msgList);
-		//发送微信订阅消息  sun
+		//2020.10.26  发送微信订阅消息  sun
 		Result result = epmetMessageOpenFeignClient.sendWxSubscribeMessage(wxmpMsgList);
 		if (!result.success()) {
 			logger.error("项目结案成功，发送微信订阅消息失败" + JSON.toJSONString(result));
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
index b2fc15543a..e73ad134cc 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
@@ -41,7 +41,9 @@
         LIMIT 1
     </select>
     <select id="selectStaffsByProjectId" resultType="java.lang.String">
-        SELECT DISTINCT STAFF_ID FROM project_staff WHERE PROJECT_ID = #{projectId}
+        SELECT DISTINCT staff_id FROM project_staff WHERE project_id = #{projectId}
+        UNION
+        SELECT DISTINCT staff_id FROM project_process WHERE operation = 'created' AND project_id =  #{projectId}
     </select>
 
     <select id="selectProjectTransferStaffList" resultType="com.epmet.dto.ProjectStaffDTO">