From ee481d8d6f597205912e8ac6f5c8705ae87ff4f7 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Thu, 25 Apr 2024 15:23:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E7=8E=8B=E6=A4=B0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=8F=90=E9=86=92=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=88=86=E9=83=A8=E5=90=8D=E7=A7=B0=20=E5=8F=8A?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=85=A8=E8=B7=AF=E5=BE=84=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RemindMessageServiceImpl.java         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/organization/service/impl/RemindMessageServiceImpl.java b/src/com/engine/organization/service/impl/RemindMessageServiceImpl.java
index 56830f44..e1aa7936 100644
--- a/src/com/engine/organization/service/impl/RemindMessageServiceImpl.java
+++ b/src/com/engine/organization/service/impl/RemindMessageServiceImpl.java
@@ -9,7 +9,6 @@ import com.engine.organization.service.RemindMessageService;
 import com.engine.organization.util.OrganizationCommonUtil;
 import lombok.SneakyThrows;
 
-import weaver.conn.RecordSet;
 import weaver.general.BaseBean;
 import weaver.hrm.company.DepartmentComInfo;
 import weaver.hrm.company.SubCompanyComInfo;
@@ -71,7 +70,7 @@ public class RemindMessageServiceImpl extends Service implements RemindMessageSe
         DepartmentComInfo deptComInfo = new DepartmentComInfo();
         SubCompanyComInfo supComInfo = new SubCompanyComInfo();
 
-        StringBuilder content = new StringBuilder("提醒：");
+        StringBuilder content = new StringBuilder();
         content.append("公司：");
         if ("dept".equals(param.getType())) {
             String departmentNameF = deptComInfo.getDepartmentName(param.getDepartmentIdFrom());
@@ -84,7 +83,7 @@ public class RemindMessageServiceImpl extends Service implements RemindMessageSe
             content.append(subcompanyNameF).append(",").append(" 部门：");
 
 
-            String departmentRealPath = deptComInfo.getDepartmentRealPath(param.getDepartmentIdFrom(), "/", "");
+            String departmentRealPath = deptComInfo.getDepartmentRealPath(param.getDepartmentIdFrom(), ">", "0");
 
             switch (param.getOperateType().getValue()){
                 case "4":
@@ -114,13 +113,15 @@ public class RemindMessageServiceImpl extends Service implements RemindMessageSe
             }
         }else {
             String subCompanynameT = supComInfo.getSubCompanyname(param.getSubCompanyIdTo());
+            String subCompanynameF = supComInfo.getSubCompanyname(param.getSubCompanyIdFrom());
 
-            content.append(param.getSubCompanyIdFrom()).append(",");
             switch (param.getOperateType().getValue()){
                 case "4":
+                    content.append(param.getSubCompanyIdFrom()).append(",");
                     content.append("已被删除，");
                     break;
                 case "8":
+                    content.append(subCompanynameF).append(",");
                     if (param.isCanceled()) {
                         content.append("已被恢复，");
                     }else {
@@ -128,6 +129,7 @@ public class RemindMessageServiceImpl extends Service implements RemindMessageSe
                     }
                     break;
                 case "5":
+                    content.append(subCompanynameF).append(",");
                     content.append("已转移到公司：").append(subCompanynameT).append(" 下，");
                     break;
                     default :break;