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 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> importForm(User user) { // 返回导入数据 List> lsGroup = new ArrayList<>(); - Map groupItem = new HashMap<>(); + Map groupItem = new HashMap<>(3); List itemList = new ArrayList<>(); groupItem.put("title", SystemEnv.getHtmlLabelName(33803, Util.getIntValue(user.getLanguage()))); groupItem.put("defaultshow", true); - List lsPromptLabel = new ArrayList<>(); //提示信息 + List lsPromptLabel = new ArrayList<>(); lsPromptLabel.add(34275); lsPromptLabel.add(125452);