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; /**