From 0b976934f21ef695051d728a06307be7bd83e64e Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Fri, 28 Mar 2025 16:30:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E5=AF=BC=E5=85=A5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=A4=87=E6=B3=A8=20=E5=A4=9A=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E6=94=AF=E6=8C=81=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/util/saveimport/JobInfoImportUtil.java | 4 ++++ .../organization/action/WorkflowStaffOperateAction.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/engine/organization/util/saveimport/JobInfoImportUtil.java b/src/com/engine/organization/util/saveimport/JobInfoImportUtil.java index 06e8d0f8..7387d6e1 100644 --- a/src/com/engine/organization/util/saveimport/JobInfoImportUtil.java +++ b/src/com/engine/organization/util/saveimport/JobInfoImportUtil.java @@ -255,6 +255,10 @@ public class JobInfoImportUtil { other.put("index", (lsPromptLabel.size() + 1)); other.put("value", "注意:分部和部门存在多层级时候用 > 分割"); itemList.add(other); + Map other1 = new HashMap<>(); + other1.put("index", (lsPromptLabel.size() + 2)); + other1.put("value", "注意:如果必填字段存在多语言不支持导入"); + itemList.add(other1); groupItem.put("items", itemList); lsGroup.add(groupItem); return lsGroup; diff --git a/src/weaver/interfaces/organization/action/WorkflowStaffOperateAction.java b/src/weaver/interfaces/organization/action/WorkflowStaffOperateAction.java index 605f524e..ac319d8a 100644 --- a/src/weaver/interfaces/organization/action/WorkflowStaffOperateAction.java +++ b/src/weaver/interfaces/organization/action/WorkflowStaffOperateAction.java @@ -119,7 +119,7 @@ public class WorkflowStaffOperateAction implements Action { MapperProxyFactory.getProxy(StaffMapper.class).insertIgnoreNull(staffPO); }); - return Action.FAILURE_AND_CONTINUE; + return Action.SUCCESS; }