Commit a801a60a by 李小龙

fix:29939 平台端-人员管理-导入:导入的角色要与组织相关联,非组织的角色需要提示,不允许导入成功

parent 1d616310
......@@ -361,7 +361,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
@Override
@Transactional
public ExcelImportVo importExcel(MultipartFile excelFile) throws Exception {
PlatUserVO userVO = PlatUserUtil.getUserVO();
List<PlatElderImportDTO> list = ExcelUtil.importExcel(null, 3, excelFile, PlatElderImportDTO.class);
List<String> spaceNameList = list.stream().flatMap(e -> Stream.of(
......@@ -374,7 +374,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
)).collect(Collectors.toList());
List<PlatSpace> spaceList = platSpaceService.list(new QueryWrapper<PlatSpace>().lambda()
.in(PlatSpace::getName, spaceNameList));
.in(PlatSpace::getName, spaceNameList).eq(PlatSpace::getOrgId,userVO.getOrgId()));
List<TreeDTOVO> treeList = BeanDtoVoUtils.listVo(spaceList, TreeDTOVO.class);
......@@ -418,7 +418,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
TreeDTOVO::getParentId, Collectors.toMap(TreeDTOVO::getName, Function.identity(),(v1,v2) -> v2)
));
List<SysConfigVO> sysConfigVOS1 = sysConfigService.viewListByCategoryCode(SysConfigCategoryConst.ELDER_CERTIFICATE_TYPE);
//List<SysConfigVO> sysConfigVOS1 = sysConfigService.viewListByCategoryCode(SysConfigCategoryConst.ELDER_CERTIFICATE_TYPE);
ExcelImportVo excelImportVo = ExcelValidatorUtil.validateMain(3, list, l -> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment