Merge remote-tracking branch 'origin/dev' into dev

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -239,7 +239,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
             if (e.getMobile().equals(dto.getMobile()) && !e.getId().equals(dto.getId())) {
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_MOBILE_DUPLICATE);
             }
-            if (StringUtils.isNotBlank(dto.getEmail()) && e.getEmail().equals(dto.getEmail()) && !e.getId().equals(dto.getId())) {
+            if (StringUtils.isNotBlank(dto.getEmail()) && StringUtils.equals(e.getEmail(),dto.getEmail()) && !e.getId().equals(dto.getId())) {
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_MAIL_DUPLICATE);
             }
         });

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

@@ -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 -> {