From d2750025a5dc88f81055a815d92b41e400c18ace Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Fri, 14 Mar 2025 17:49:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=80=E7=A7=B0=E5=8F=8A?=
 =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E6=A0=91=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/entity/department/bo/DepartmentBO.java       | 2 +-
 .../organization/entity/department/dto/DepartmentListDTO.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java
index 1b51b49b..4b1e3841 100644
--- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java
+++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java
@@ -171,7 +171,7 @@ public class DepartmentBO {
             tree.setPid(null == item.getSupDepId() ? "0" : item.getSupDepId().toString());
             tree.setSelected(false);
             tree.setType("2");
-            tree.setParentComp(null == item.getSupDepId() ? "0" : item.getSubCompanyId1().toString());
+            tree.setParentComp(null == item.getSubCompanyId1() ? "0" : item.getSubCompanyId1().toString());
             tree.setOrderNum(null == item.getShowOrder() ? 0.00 : item.getShowOrder().intValue());
             tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0.00 : item.getShowOrderOfTree());
             return tree;
diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java
index b16a3186..af6e170f 100644
--- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java
+++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java
@@ -36,7 +36,7 @@ public class DepartmentListDTO {
     /**
      * 名称
      */
-    @TableTitle(labelId = 547141, title = "名称", dataIndex = "departmentMark", key = "departmentMark", width = "200")
+    @TableTitle(labelId = 547181, title = "简称", dataIndex = "departmentMark", key = "departmentMark", width = "200")
     private String departmentMark;
 
     /**
@@ -48,7 +48,7 @@ public class DepartmentListDTO {
     /**
      * 简称
      */
-    @TableTitle(labelId = 547181, title = "简称", dataIndex = "departmentName", key = "departmentName")
+    @TableTitle(labelId = 547141, title = "名称", dataIndex = "departmentName", key = "departmentName")
     private String departmentName;
 
     /**