|
@ -179,7 +179,7 @@ public class ExcelService implements IExcelService { |
|
|
private void readProject(XSSFSheet wbsSheet, int projectInfoStart, int projectInfoEnd, Long currentUserId, SysProject sysProject) throws Exception { |
|
|
private void readProject(XSSFSheet wbsSheet, int projectInfoStart, int projectInfoEnd, Long currentUserId, SysProject sysProject) throws Exception { |
|
|
XSSFRow row = wbsSheet.getRow(projectInfoStart + 1); |
|
|
XSSFRow row = wbsSheet.getRow(projectInfoStart + 1); |
|
|
if(ObjectUtil.isNull(row)){ |
|
|
if(ObjectUtil.isNull(row)){ |
|
|
throw new BaseException(CodeEnum.NOT_ROW.addMsg(wbsSheet.getSheetName() + (projectInfoStart + 1))); |
|
|
throw new BaseException(CodeEnum.notProject(wbsSheet.getSheetName() + (projectInfoStart + 1))); |
|
|
} |
|
|
} |
|
|
String projectName = ExcelUtil.getCellValue(row.getCell(0)); |
|
|
String projectName = ExcelUtil.getCellValue(row.getCell(0)); |
|
|
if (StrUtil.isNotEmpty(projectName)) { |
|
|
if (StrUtil.isNotEmpty(projectName)) { |
|
@ -393,7 +393,7 @@ public class ExcelService implements IExcelService { |
|
|
for (int j = 0; j < split.length; j++) { |
|
|
for (int j = 0; j < split.length; j++) { |
|
|
ProMemberRole memberRole = null; |
|
|
ProMemberRole memberRole = null; |
|
|
for (ProMember member : proMembers) { |
|
|
for (ProMember member : proMembers) { |
|
|
if (split[i].equalsIgnoreCase(member.getNickname())) { |
|
|
if (split[j].equalsIgnoreCase(member.getNickname())) { |
|
|
memberRole = new ProMemberRole(); |
|
|
memberRole = new ProMemberRole(); |
|
|
memberRole.setId(snowflake.nextId()); |
|
|
memberRole.setId(snowflake.nextId()); |
|
|
memberRole.setMemberId(member.getId()); |
|
|
memberRole.setMemberId(member.getId()); |
|
|