大王椰项目工作流提醒 修复分部名称 及部门全路径格式

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;