From 472cc4ab9aa8771c3c0ce75717b75cd60f0211eb Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Fri, 24 Mar 2023 14:24:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=A4=A7=E9=87=91=E4=BB=93=E7=89=88?=
 =?UTF-8?q?=E6=9C=ACbug=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/mapper/version/CompanyVersionMapper.xml    | 6 +++---
 .../service/impl/HrmPersonnelCardServiceImpl.java           | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml b/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
index 58ad054a..0908c91a 100644
--- a/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
+++ b/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
@@ -257,7 +257,7 @@
                 and a.subComId = #{subComId}
             </if>
             <if test="version !=null">
-                and a.version like #{version}
+                and a.version = #{version}
             </if>
         </where>
         ORDER BY a.VERSION ASC
@@ -274,7 +274,7 @@
                 and a.departmentid = #{departmentid}
             </if>
             <if test="version !=null">
-                and a.version like #{version}
+                and a.version = #{version}
             </if>
         </where>
         ORDER BY a.VERSION ASC
@@ -301,7 +301,7 @@
                 and a.resourceid = #{resourceid}
             </if>
             <if test="version !=null">
-                and a.version like #{version}
+                and a.version = #{version}
             </if>
         </where>
         ORDER BY a.VERSION ASC
diff --git a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java
index 7b857b6b..c36c1d84 100644
--- a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java
@@ -182,6 +182,9 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel
         hfm.getCustomFields();
         while (hfm.next()) {
             String fieldName = hfm.getFieldname();
+            if (!hfm.isUse()) {
+                continue;
+            }
             JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName);
             String fieldLabel = Util.toScreen(SystemEnv.getHtmlLabelName(hrmFieldConf.getInt("fieldlabel"), user.getLanguage()), user.getLanguage());
             if ("resourceimageid".equals(fieldName) || "messagerurl".equals(fieldName) || "职等职级".equals(fieldLabel)) {