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 1/2] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=80=E7=A7=B0?= =?UTF-8?q?=E5=8F=8A=E8=8A=B1=E5=90=8D=E5=86=8C=E6=A0=91=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=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; /** -- 2.40.0.windows.1 From 418a302fcbf956d93789666f12eed91a71d56965 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 20 Mar 2025 09:34:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=80=E7=A7=B0?= =?UTF-8?q?=E5=8F=8A=E8=8A=B1=E5=90=8D=E5=86=8C=E6=A0=91=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/department/bo/DepartmentBO.java | 9 +++++++++ .../entity/department/dto/DepartmentListDTO.java | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 4b1e3841..7b539883 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -10,6 +10,7 @@ import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import weaver.file.ImageFileManager; import weaver.general.Util; import weaver.hrm.company.DepartmentComInfo; import weaver.hrm.company.SubCompanyComInfo; @@ -38,8 +39,10 @@ public class DepartmentBO { } public static void setDeptLeader(List departments) { + for (DepartmentListDTO dept : departments) { dept.setBmfzr(getEmployeeNameById(dept.getId())); + List children = dept.getChildren(); if (CollectionUtils.isNotEmpty(children)){ setDeptLeader(children); @@ -227,5 +230,11 @@ public class DepartmentBO { } } + /** + * 获取部门自定义表字段（附件）显示值 跳转链接 + */ + private Map getImageFileName(Integer depetId){ + return null; + } } diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index af6e170f..913d45a2 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -84,6 +84,16 @@ public class DepartmentListDTO { */ @TableTitle(labelId = 547186, title = "启用", dataIndex = "canceled", key = "canceled") private int canceled; + + /** + * 附件上传 + */ + @TableTitle(labelId = 17616, title = "附件上传", dataIndex = "imageFileName", key = "imageFileName") + private String imageFileName; + + private String fileUrl; + + /** * 操作列 */ -- 2.40.0.windows.1