部门简称及花名册树问题修复 #292

Merged
liang.cheng merged 1 commits from 山西国药控股有限公司 into feature/cl 1 month ago

@ -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;
}
}

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

Loading…
Cancel
Save