From f928ea04d536457d2815b1e3f24ab3817a02bb69 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Wed, 3 Jul 2024 10:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8D=A1=E7=89=87=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E3=80=81=E5=8E=BB=E9=99=A4=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=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 @@
         <if test="null!=parentId and parentId !=0">
             and viewtype = 1
         </if>
+        order by scopeorder
     </select>
 </mapper>
\ 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;