From f928ea04d536457d2815b1e3f24ab3817a02bb69 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 3 Jul 2024 10:08:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8D=A1=E7=89=87?= =?UTF-8?q?=EF=BC=8C=E6=8E=92=E5=BA=8F=E3=80=81=E5=8E=BB=E9=99=A4=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/personnelcard/PersonnelCardMapper.xml | 1 + .../service/impl/HrmPersonnelCardServiceImpl.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml b/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml index 3b45911f..e58ebf5e 100644 --- a/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml +++ b/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml @@ -61,5 +61,6 @@ and viewtype = 1 + order by scopeorder \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java index c7aec95d..41fdf7c6 100644 --- a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java +++ b/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; -- 2.40.0.windows.1 From 37f0361d92a8554841a5ce8086b6d6cfc6c94f99 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 3 Jul 2024 10:09:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E6=A0=91?= =?UTF-8?q?=EF=BC=8C=E5=90=8C=E7=BA=A7=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=B1=95=E7=A4=BA=E5=9C=A8=E5=88=86=E9=83=A8?= =?UTF-8?q?=E5=89=8D=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/util/tree/SearchTreeUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java index 65dd9617..b1065faa 100644 --- a/src/com/engine/organization/util/tree/SearchTreeUtil.java +++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java @@ -124,8 +124,8 @@ public class SearchTreeUtil { List 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()); -- 2.40.0.windows.1 From 75b381f6d8d900a5620d2684eec916a179e7c7f6 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 3 Jul 2024 10:49:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=91=EF=BC=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0=E5=8F=96=E7=AE=80=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/entity/department/bo/DepartmentBO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 70d955f2..7dae62d8 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/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"); -- 2.40.0.windows.1