Merge pull request '部门简称及花名册树问题修复' (#292) from 山西国药控股有限公司 into feature/cl

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/292

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<DepartmentListDTO> departments) {
+
         for (DepartmentListDTO dept : departments) {
             dept.setBmfzr(getEmployeeNameById(dept.getId()));
+
             List<DepartmentListDTO> children = dept.getChildren();
             if (CollectionUtils.isNotEmpty(children)){
                 setDeptLeader(children);
@@ -227,5 +230,11 @@ public class DepartmentBO {
         }
     }
 
+    /**
+     * 获取部门自定义表字段（附件）显示值 跳转链接
+     */
+    private Map<String,String> getImageFileName(Integer depetId){
+        return null;
+    }
 
 }

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;
+
+
     /**
      * 操作列
      */