liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'feature/dxf' (#262) from feature/dxf into develop 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/262
This commit is contained in:
dxfeng 2024-07-03 10:55:50 +08:00
parent fcf177c194 75b381f6d8
commit 251a001eac
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/entity/department/bo/DepartmentBO.java
View File

@ -163,7 +163,7 @@ public class DepartmentBO {
tree.setId(item.getId().toString());
tree.setIsParent(false);
tree.setIsVirtual("0");
tree.setName(item.getDepartmentName());
tree.setName(item.getDepartmentMark());
tree.setPid(null == item.getSupDepId() ? "0" : item.getSupDepId().toString());
tree.setSelected(false);
tree.setType("2");

1
src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml
View File

@ -61,5 +61,6 @@
<if test="null!=parentId and parentId !=0">
and viewtype = 1
</if>
order by scopeorder
</select>
</mapper>

5
src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java
View File

@ -186,6 +186,11 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel
continue;
}
JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName);
String fieldhtmltype = hrmFieldConf.getString("fieldhtmltype");
if("6".equals(fieldhtmltype)){
// 去除附件类型字段
continue;
}
String fieldLabel = Util.toScreen(SystemEnv.getHtmlLabelName(hrmFieldConf.getInt("fieldlabel"), user.getLanguage()), user.getLanguage());
if ("resourceimageid".equals(fieldName) || "messagerurl".equals(fieldName) || "职等职级".equals(fieldLabel)) {
continue;

4
src/com/engine/organization/util/tree/SearchTreeUtil.java
View File

@ -124,8 +124,8 @@ public class SearchTreeUtil {
List<SearchTree> searchTrees = childMap.get(e.getId()).stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList());
treeNodes.addAll(searchTrees);
}
if (CollectionUtils.isNotEmpty(e.getSubs())) {
treeNodes.addAll(e.getSubs());
if(CollectionUtils.isNotEmpty(treeNodes)){
treeNodes = treeNodes.stream().sorted(Comparator.comparing(TreeNode::getType).reversed()).collect(Collectors.toCollection(LinkedHashSet::new));
}
e.setSubs(new ArrayList<>(treeNodes));
leafIds.add(e.getId());