将jobtitlename字段替换为jobtitlemark

This commit is contained in:
dxfeng 2024-12-19 10:55:12 +08:00
parent 7e6bd30b54
commit f8433849e3
3 changed files with 6 additions and 3 deletions

View File

@ -59,7 +59,7 @@ public class AddJobTitleCmd extends AbstractCommonCommand<Map<String, Object>> {
String isBrowser = Util.null2String(params.get("isBrowser"));
String jobtitlemark = Util.null2String(params.get("jobtitlemark"));
String remarkMultilingual = Util.formatMultiLang(jobtitlemark,""+user.getLanguage());
String jobtitlename = Util.null2String(params.get("jobtitlename"));
String jobtitlename = jobtitlemark;
String jobactivityid = Util.null2String(params.get("jobactivityid"));
String jobresponsibility = Util.null2String(params.get("jobresponsibility"));
String jobcompetency = Util.null2String(params.get("jobcompetency"));

View File

@ -58,7 +58,7 @@ public class EditJobTitleCmd extends AbstractCommonCommand<Map<String, Object>>
String operateIp = Util.null2String(params.get("operateIp"));
String jobtitlemark = Util.null2String(params.get("jobtitlemark"));
String remarkMultilingual = Util.formatMultiLang(jobtitlemark,""+user.getLanguage());
String jobtitlename = Util.null2String(params.get("jobtitlename"));
String jobtitlename = jobtitlemark;
String jobactivityid = Util.null2String(params.get("jobactivityid"));
String jobresponsibility = Util.null2String(params.get("jobresponsibility"));
String jobcompetency = Util.null2String(params.get("jobcompetency"));

View File

@ -187,10 +187,13 @@ public class GetJobTitleFormCmd extends AbstractCommonCommand<Map<String, Object
searchConditionItem.setLabelcol(6);
searchConditionItem.setFieldcol(18);
if (hrmFieldBean.getFieldname().equals("jobtitlemark") || hrmFieldBean.getFieldname().equals("jobtitlename") || hrmFieldBean.getFieldname().equals("jobactivityid")) {
if (hrmFieldBean.getFieldname().equals("jobtitlemark") || hrmFieldBean.getFieldname().equals("englishname") || hrmFieldBean.getFieldname().equals("jobactivityid")) {
searchConditionItem.setViewAttr(3);
searchConditionItem.setRules("required|string");
}
if( hrmFieldBean.getFieldname().equals("jobtitlename")){
continue;
}
if(onlyView){
searchConditionItem.setViewAttr(1);
}