From a43660d62a811a7f39c67e26db23e33006a950d1 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Tue, 16 Jan 2024 10:27:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93/=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B):=20799?=
 =?UTF-8?q?13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fb/service/impl/ProcessFbEntryChangeServiceImpl.java      | 2 +-
 .../service/impl/LawsDataCenterFileServiceImpl.java           | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
index 31528eb6..090cfb3b 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
@@ -152,7 +152,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
         userInfoMap.put("engineer", CurrentUserUtil.getId()); // 第一个任务节点设置成自己
         BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
         basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.FB_ENTRY_CHANGE)); // 流程定义id
-        basicProcessInfoDTO.setProcessName(getProcessNameByBusinessId(processInfoVO.getBusinessId())); // 流程名称
+//        basicProcessInfoDTO.setProcessName(getProcessNameByBusinessId(processInfoVO.getBusinessId())); // 流程名称
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_ENTRY_CHANGE.getValue()); // 流程类型
         processHandleService.startProcess(processInfoVO);
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
index 1892d698..1f7ac85c 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
@@ -203,7 +203,9 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
 		try {
 			// 发送消息
 			LawsDataCenterFile dataCenterFile = getById(lawsDataCenterFile.getId());
-			if (StringUtils.isNotBlank(dataCenterFile.getPushRangeIds()) && !dataCenterFile.getPushRangeIds().equals(lawsDataCenterFile.getPushRangeIds())){
+			if (StringUtils.isNotBlank(dataCenterFile.getPushRangeIds())
+//					&& !dataCenterFile.getPushRangeIds().equals(lawsDataCenterFile.getPushRangeIds())
+			){
 				SendMessageDTO sendMessageDTO = new SendMessageDTO();
 				sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.DATA_CENTER);
 				sendMessageDTO.setToUserId(lawsDataCenterFile.getPushRangeIds());