人大金仓版本bug处理

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

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)) {