fixbug：长者导入，居家工作台

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

@@ -330,7 +330,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         );
         );
 
 
         Map<String, Map<String, TreeDTOVO>> parentIdName = treeList.stream().collect(Collectors.groupingBy(
         Map<String, Map<String, TreeDTOVO>> parentIdName = treeList.stream().collect(Collectors.groupingBy(
-                TreeDTOVO::getParentId, Collectors.toMap(TreeDTOVO::getName, Function.identity())
+                TreeDTOVO::getParentId, Collectors.toMap(TreeDTOVO::getName, Function.identity(),(v1,v2) -> v2)
         ));
         ));
 
 
         ExcelImportVo excelImportVo = ExcelValidatorUtil.validateMain(3, list, l -> {
         ExcelImportVo excelImportVo = ExcelValidatorUtil.validateMain(3, list, l -> {

server-service/src/main/java/com/makeit/service/platform/workstation/impl/WorkStationServiceImpl.java

@@ -485,7 +485,7 @@ public class WorkStationServiceImpl implements WorkStationService {
             dto.setOrgIds(orgIds);
             dto.setOrgIds(orgIds);
         }else {
         }else {
             List<PlatOrg> orgs = platOrgService.list(new QueryWrapper<PlatOrg>().lambda()
             List<PlatOrg> orgs = platOrgService.list(new QueryWrapper<PlatOrg>().lambda()
-                    .eq(PlatOrg::getId, dto.getOrgIds()));
+                    .in(PlatOrg::getId, dto.getOrgIds()));
             List<String> orgIds = orgs.stream().filter(t->PlatOrgEnum.OrgTypeEnum.HOME.getValue().equals(t.getType()))
             List<String> orgIds = orgs.stream().filter(t->PlatOrgEnum.OrgTypeEnum.HOME.getValue().equals(t.getType()))
                     .map(PlatOrg::getId).collect(Collectors.toList());
                     .map(PlatOrg::getId).collect(Collectors.toList());
             if(orgIds.isEmpty()){
             if(orgIds.isEmpty()){

server-service/src/main/java/com/makeit/service/saas/impl/PlatTenantServiceImpl.java

@@ -249,7 +249,7 @@ public class PlatTenantServiceImpl extends ServiceImpl<PlatTenantMapper, PlatTen
     }
     }
 
 
 
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     public String add(PlatTenantDTOVO dto) {
     public String add(PlatTenantDTOVO dto) {
         checkName(dto);
         checkName(dto);
@@ -281,7 +281,7 @@ public class PlatTenantServiceImpl extends ServiceImpl<PlatTenantMapper, PlatTen
     }
     }
 
 
 
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     @TenantIdIgnore
     @TenantIdIgnore
     public void edit(PlatTenantDTOVO dto) {
     public void edit(PlatTenantDTOVO dto) {