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} - and a.version like #{version} + and a.version = #{version} ORDER BY a.VERSION ASC @@ -274,7 +274,7 @@ and a.departmentid = #{departmentid} - and a.version like #{version} + and a.version = #{version} ORDER BY a.VERSION ASC @@ -301,7 +301,7 @@ and a.resourceid = #{resourceid} - and a.version like #{version} + and a.version = #{version} 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)) {