From f8433849e3c4b0a99d0e56b991204fea26a29e96 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Thu, 19 Dec 2024 10:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86jobtitlename=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BAjobtitlemark?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java     | 2 +-
 src/com/engine/hrm/cmd/jobset/EditJobTitleCmd.java    | 2 +-
 src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java b/src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java
index 228f44f..5c0973a 100644
--- a/src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java
+++ b/src/com/engine/hrm/cmd/jobset/AddJobTitleCmd.java
@@ -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"));
diff --git a/src/com/engine/hrm/cmd/jobset/EditJobTitleCmd.java b/src/com/engine/hrm/cmd/jobset/EditJobTitleCmd.java
index 60171a3..07d3891 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<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"));
diff --git a/src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java b/src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java
index 7b05c7b..999048a 100644
--- a/src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java
+++ b/src/com/engine/hrm/cmd/jobset/GetJobTitleFormCmd.java
@@ -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);
             }