liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

人大金仓版本bug处理

This commit is contained in:
Mlin 2023-03-24 14:24:55 +08:00
parent 0cd9f94a93
commit 472cc4ab9a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
View File

@ -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

3
src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java
View File

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