From caa96043150da04c2e563d8280d7a103d7395ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98ml=E2=80=99?= Date: Wed, 16 Nov 2022 11:22:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=81=8C=E7=BA=A7=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E6=96=B9=E6=A1=881116?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/ImportCommonServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java index b4d3d014..e3b76a15 100644 --- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java @@ -1571,7 +1571,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ throw new RuntimeException(e); } int allRow = 0; - nextSheet: for (int s = 0; s < workbook.getNumberOfSheets(); s++) { // 当前sheet XSSFSheet sheetAt = workbook.getSheetAt(s); @@ -1654,7 +1653,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ historyDetailPO.setOperateDetail("方案编号[" + reallyValue + "]与原有编号重复"); historyDetailPO.setStatus("0"); saveImportDetailLog(historyDetailPO); - break nextSheet; + continue nextRow; } } // 职等页校验(方案是否存在) From cb4db723e462b00839b374948b156cad35342f81 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 16 Nov 2022 14:06:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E2=80=9C=E6=A0=8F=E7=9B=AE=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E4=BF=AE=E5=A4=8D=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/personnelcard/vo/CardAccessVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java b/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java index fd2b043a..934ebbeb 100644 --- a/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java +++ b/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java @@ -33,7 +33,7 @@ import lombok.NoArgsConstructor; orderby = "id", sortway = "asc", primarykey = "id", - tableType = WeaTableType.CHECKBOX + tableType = WeaTableType.NONE ) public class CardAccessVO {