ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:78364

Browse Source
This commit is contained in:
梁琦涛
2023-11-09 15:49:49 +08:00
parent 143ca8b151
commit 3ac77a359a
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
+5 -8
View File
@@ -94,7 +94,6 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
/** /**
* 添加 * 添加
*/ */
@RequiresPermissions("sys:innerWorkingGroup:add")
@AutoLog(value = "内部工作组人员关联表-添加") @AutoLog(value = "内部工作组人员关联表-添加")
@ApiOperation(value = "内部工作组人员关联表-添加", notes = "内部工作组人员关联表-添加") @ApiOperation(value = "内部工作组人员关联表-添加", notes = "内部工作组人员关联表-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
@@ -140,7 +139,6 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
/** /**
* 通过id删除 * 通过id删除
*/ */
@RequiresPermissions("sys:innerWorkingGroup:delete")
@AutoLog(value = "内部工作组人员关联表-通过id删除") @AutoLog(value = "内部工作组人员关联表-通过id删除")
@ApiOperation(value = "内部工作组人员关联表-通过id删除", notes = "内部工作组人员关联表-通过id删除") @ApiOperation(value = "内部工作组人员关联表-通过id删除", notes = "内部工作组人员关联表-通过id删除")
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
@@ -162,7 +160,6 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
/** /**
* 通过excel导入数据 * 通过excel导入数据
*/ */
@RequiresPermissions("sys:innerWorkingGroup:import")
@AutoLog(value = "内部工作组人员关联表-导入") @AutoLog(value = "内部工作组人员关联表-导入")
@ApiOperation(value = "内部工作组人员关联表-导入", notes = "内部工作组人员关联表-导入") @ApiOperation(value = "内部工作组人员关联表-导入", notes = "内部工作组人员关联表-导入")
@PostMapping(value = "/importExcel") @PostMapping(value = "/importExcel")
@@ -260,24 +257,24 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
String username = lawsWorkingGroupUser.getUsername(); String username = lawsWorkingGroupUser.getUsername();
String realname = lawsWorkingGroupUser.getRealname(); String realname = lawsWorkingGroupUser.getRealname();
if (StringUtils.isBlank(username)) { if (StringUtils.isBlank(username)) {
return MessageUtils.getMessage(ResultCommon.THE_JOB_NUMBER_CANNOT_BE_EMPTY_EXPORT, (i + 1)); return MessageUtils.getMessage(ResultCommon.THE_JOB_NUMBER_CANNOT_BE_EMPTY_EXPORT, (i + 2));
} }
if (StringUtils.isBlank(realname)) { if (StringUtils.isBlank(realname)) {
return "第（" + (i + 1) + "）行,姓名不能为空"; return "第（" + (i + 2) + "）行,姓名不能为空";
} }
if(!CollectionUtils.isEmpty(listSysUser)){ if(!CollectionUtils.isEmpty(listSysUser)){
String finalUsername = username; String finalUsername = username;
Optional<SysUser> op = listSysUser.stream().filter(o->Objects.equals(o.getUsername(), finalUsername)).findFirst(); Optional<SysUser> op = listSysUser.stream().filter(o->Objects.equals(o.getUsername(), finalUsername)).findFirst();
if(!op.isPresent()){ if(!op.isPresent()){
return MessageUtils.getMessage(ResultCommon.JOB_NUMBER_DOES_NOT_EXIST_EXPORT, (i + 1)); return MessageUtils.getMessage(ResultCommon.JOB_NUMBER_DOES_NOT_EXIST_EXPORT, (i + 2));
} }
username = op.get().getId(); username = op.get().getId();
if(!Objects.equals(op.get().getRealname(),realname)){ if(!Objects.equals(op.get().getRealname(),realname)){
return "第（" + (i + 1) + "）行,姓名与工号不匹配"; return "第（" + (i + 2) + "）行,姓名与工号不匹配";
} }
} }
if (!existingWorkNos.add(username)) { if (!existingWorkNos.add(username)) {
return MessageUtils.getMessage(ResultCommon.DUPLICATE_JOB_NUMBER_EXPORT, (i + 1)); return MessageUtils.getMessage(ResultCommon.DUPLICATE_JOB_NUMBER_EXPORT, (i + 2));
} }
return null; return null;
}).filter(Objects::nonNull).collect(Collectors.toList()); }).filter(Objects::nonNull).collect(Collectors.toList());
laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java
+1 -2
View File
@@ -217,8 +217,7 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
mv.addObject(JeroController.FILE_NAME, title); mv.addObject(JeroController.FILE_NAME, title);
mv.addObject(JeroController.CLASS, LawsWorkingGroupUser.class); mv.addObject(JeroController.CLASS, LawsWorkingGroupUser.class);
ExportParams exportParams = new ExportParams(null, title); ExportParams exportParams = new ExportParams(null, title);
// 导出xlsx // 导出xls
exportParams.setType(ExcelType.XSSF);
mv.addObject(JeroController.PARAMS, exportParams); mv.addObject(JeroController.PARAMS, exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, dos); mv.addObject(NormalExcelConstants.DATA_LIST, dos);
return mv; return mv;