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

Reviewed-on: #262

src/com/engine/organization/entity/department/bo/DepartmentBO.java

@@ -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");

src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml

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

src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java

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

src/com/engine/organization/util/tree/SearchTreeUtil.java

@@ -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())) {
+            if(CollectionUtils.isNotEmpty(treeNodes)){
-                treeNodes.addAll(e.getSubs());
+                treeNodes = treeNodes.stream().sorted(Comparator.comparing(TreeNode::getType).reversed()).collect(Collectors.toCollection(LinkedHashSet::new));
             }
             e.setSubs(new ArrayList<>(treeNodes));
             leafIds.add(e.getId());