liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

This commit is contained in:
dxfeng 2022-11-16 14:58:48 +08:00
parent 05364f9265 b3bfad0148
commit 67fd2df4f9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java
View File

@ -33,7 +33,7 @@ import lombok.NoArgsConstructor;
orderby = "id",
sortway = "asc",
primarykey = "id",
tableType = WeaTableType.CHECKBOX
tableType = WeaTableType.NONE
)
public class CardAccessVO {

3
src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
View File

@ -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;
}
}
// 职等页校验(方案是否存在)