From 499520e39d5cf397c95cc07b761e170de53da2a5 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 25 Dec 2024 09:20:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E4=BA=8C=E5=BC=80=20?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java | 6 +----- src/com/engine/hrm/cmd/jobset/EditJobTitleCmd.java | 6 +----- src/com/engine/hrm/cmd/jobset/GetJobDetailCmd.java | 4 ---- src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java | 7 ++----- 4 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java b/src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java index 5c0973a..957f350 100644 --- a/src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java +++ b/src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java @@ -59,14 +59,13 @@ public class AddJobTitleCmd extends AbstractCommonCommand> { String isBrowser = Util.null2String(params.get("isBrowser")); String jobtitlemark = Util.null2String(params.get("jobtitlemark")); String remarkMultilingual = Util.formatMultiLang(jobtitlemark,""+user.getLanguage()); - String jobtitlename = jobtitlemark; + String jobtitlename = Util.null2String(params.get("jobtitlename")); String jobactivityid = Util.null2String(params.get("jobactivityid")); String jobresponsibility = Util.null2String(params.get("jobresponsibility")); String jobcompetency = Util.null2String(params.get("jobcompetency")); String jobtitleremark = Util.null2String(params.get("jobtitleremark")); String jobdoc = Util.null2String(params.get("jobdoc")); String jobtitlecode = Util.null2String(params.get("jobtitlecode")); - String englishname = Util.null2String(params.get("englishname")); String[] strObj = {jobtitlemark, jobtitlename, jobactivityid, Util.null2String(params.get("jobresponsibility")), Util.null2String(params.get("jobcompetency")), @@ -128,9 +127,6 @@ public class AddJobTitleCmd extends AbstractCommonCommand> { String sql = "update HrmJobTitles set " + DbFunctionUtil.getInsertUpdateSetSql(RecordSet.getDBType(), user.getUID()) + " where id=" + id; RecordSet.executeUpdate(sql); - // 更新英文名称 - sql = "update HrmJobTitles set englishname = ? where id= ?"; - RecordSet.executeUpdate(sql,englishname,id); HrmServiceManager HrmServiceManager = new HrmServiceManager(); HrmServiceManager.SynInstantJobtitle("" + id, "1"); diff --git a/src/com/engine/hrm/cmd/jobset/EditJobTitleCmd.java b/src/com/engine/hrm/cmd/jobset/EditJobTitleCmd.java index 07d3891..552d88f 100644 --- a/src/com/engine/hrm/cmd/jobset/EditJobTitleCmd.java +++ b/src/com/engine/hrm/cmd/jobset/EditJobTitleCmd.java @@ -58,7 +58,7 @@ public class EditJobTitleCmd extends AbstractCommonCommand> String operateIp = Util.null2String(params.get("operateIp")); String jobtitlemark = Util.null2String(params.get("jobtitlemark")); String remarkMultilingual = Util.formatMultiLang(jobtitlemark,""+user.getLanguage()); - String jobtitlename = jobtitlemark; + String jobtitlename = Util.null2String(params.get("jobtitlename")); String jobactivityid = Util.null2String(params.get("jobactivityid")); String jobresponsibility = Util.null2String(params.get("jobresponsibility")); String jobcompetency = Util.null2String(params.get("jobcompetency")); @@ -66,7 +66,6 @@ public class EditJobTitleCmd extends AbstractCommonCommand> String jobdoc = Util.null2String(params.get("jobdoc")); String id = Util.null2String(params.get("id")); String jobtitlecode = Util.null2String(params.get("jobtitlecode")); - String englishname = Util.null2String(params.get("englishname")); try { // jobtitlecode = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType.JOBTITLES, jobtitlecode); if (StringUtils.isNotEmpty(jobtitlecode)) { @@ -127,9 +126,6 @@ public class EditJobTitleCmd extends AbstractCommonCommand> String sql = "update HrmJobTitles set "+ DbFunctionUtil.getUpdateSetSql(RecordSet.getDBType(),user.getUID())+" where id="+id; RecordSet.executeUpdate(sql); - // 更新英文名称 - sql = "update HrmJobTitles set englishname = ? where id= ?"; - RecordSet.executeUpdate(sql,englishname,id); HrmServiceManager HrmServiceManager = new HrmServiceManager(); JobTitlesComInfo JobTitlesComInfo = new JobTitlesComInfo(); diff --git a/src/com/engine/hrm/cmd/jobset/GetJobDetailCmd.java b/src/com/engine/hrm/cmd/jobset/GetJobDetailCmd.java index cddde19..3de8ee6 100644 --- a/src/com/engine/hrm/cmd/jobset/GetJobDetailCmd.java +++ b/src/com/engine/hrm/cmd/jobset/GetJobDetailCmd.java @@ -107,10 +107,6 @@ public class GetJobDetailCmd extends AbstractCommonCommand> datas.put("value", rs.getString(3)); list.add(datas); - datas = new HashMap(); - datas.put("label", SystemEnv.getHtmlLabelName(548239, Util.getIntValue(user.getLanguage()))); - datas.put("value", rs.getString("englishname")); - list.add(datas); datas = new HashMap(); datas.put("label", SystemEnv.getHtmlLabelName(524944, Util.getIntValue(user.getLanguage()))); datas.put("value", rs.getString("jobtitlecode")); diff --git a/src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java b/src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java index 999048a..66ae45c 100644 --- a/src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java +++ b/src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java @@ -125,7 +125,7 @@ public class GetJobTitleFormCmd extends AbstractCommonCommand