From 19b844ed89049e27e429e0adebe45f2fe976889a Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Wed, 6 Sep 2023 17:24:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=88=B6=E4=BF=A1=E6=81=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../util/saveimport/StaffInfoImportUtil.java   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java
index 755d5baf..cd1009bd 100644
--- a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java
+++ b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java
@@ -285,17 +285,21 @@ public class StaffInfoImportUtil {
                     checkMsg = "编制方案数据有误，请确认";
                     break;
             }
+
+            StaffPO staffPO = StaffBO.convertParamToPO(param, (long) user.getUID());
+            if (null == staffPO.getControlPolicy()) {
+                staffPO.setControlPolicy(1);
+            }
+            List<StaffPO> verify = MapperProxyFactory.getProxy(StaffMapper.class).customSelect(param.getPlanId(), param.getEcCompany(), param.getEcDepartment(), param.getJobId());
+            if (!verify.isEmpty()) {
+                checkMsg = "同一编制方案下，同一维度的编制信息不可重复创建！";
+            }
             if (StringUtils.isNotBlank(checkMsg)) {
                 historyDetailPO.setOperateDetail(checkMsg);
                 historyDetailPO.setStatus("0");
                 OrgImportUtil.saveImportDetailLog(historyDetailPO);
                 continue;
             }
-
-            StaffPO staffPO = StaffBO.convertParamToPO(param, (long) user.getUID());
-            if (null == staffPO.getControlPolicy()) {
-                staffPO.setControlPolicy(1);
-            }
             MapperProxyFactory.getProxy(StaffMapper.class).insertIgnoreNull(staffPO);
             // 初始化编制信息
             StaffServiceImpl.initStaffInfo(staffPO);
@@ -312,11 +316,11 @@ public class StaffInfoImportUtil {
     public static List<Map<String, Object>> importForm(User user) {
         // 返回导入数据
         List<Map<String, Object>> lsGroup = new ArrayList<>();
-        Map<String, Object> groupItem = new HashMap<>();
+        Map<String, Object> groupItem = new HashMap<>(3);
         List<Object> itemList = new ArrayList<>();
         groupItem.put("title", SystemEnv.getHtmlLabelName(33803, Util.getIntValue(user.getLanguage())));
         groupItem.put("defaultshow", true);
-        List<Integer> lsPromptLabel = new ArrayList<>(); //提示信息
+        List<Integer> lsPromptLabel = new ArrayList<>();
         lsPromptLabel.add(34275);
         lsPromptLabel.add(125452);