diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 1b51b49b..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); @@ -171,7 +174,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; @@ -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 b16a3186..913d45a2 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; /** @@ -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; + + /** * 操作列 */