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

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

@@ -84,6 +84,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -1010,6 +1011,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
         LambdaUpdateWrapper<PlatUser> updateWrapper = Wrappers.lambdaUpdate(PlatUser.class)
         LambdaUpdateWrapper<PlatUser> updateWrapper = Wrappers.lambdaUpdate(PlatUser.class)
                 .set(PlatUser::getTenantId, tenantId)
                 .set(PlatUser::getTenantId, tenantId)
                 .set(PlatUser::getOrgId,tenantId)
                 .set(PlatUser::getOrgId,tenantId)
+                .set(PlatUser::getOrgPath,tenantId)
                 .eq(BaseEntity::getId, platUserId);
                 .eq(BaseEntity::getId, platUserId);
         this.update(updateWrapper);
         this.update(updateWrapper);
     }
     }
@@ -1034,7 +1036,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
         LambdaQueryWrapper<PlatRole> roleLambdaQueryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<PlatRole> roleLambdaQueryWrapper = new LambdaQueryWrapper<>();
         roleLambdaQueryWrapper.select(BaseEntity::getId,PlatRole::getName);
         roleLambdaQueryWrapper.select(BaseEntity::getId,PlatRole::getName);
         List<PlatRole> roleList = platRoleService.list(roleLambdaQueryWrapper);
         List<PlatRole> roleList = platRoleService.list(roleLambdaQueryWrapper);
-        Map<String, String> orgNameMap = orgList.stream().collect(Collectors.toMap(PlatOrg::getName, BaseEntity::getId, (a, b) -> a));
+        Map<String, PlatOrg> orgNameMap = orgList.stream().collect(Collectors.toMap(PlatOrg::getName, vo->vo, (a, b) -> a));
         Map<String, String> roleNameMap = roleList.stream().collect(Collectors.toMap(PlatRole::getName, BaseEntity::getId, (a, b) -> a));
         Map<String, String> roleNameMap = roleList.stream().collect(Collectors.toMap(PlatRole::getName, BaseEntity::getId, (a, b) -> a));
 
 
         LambdaQueryWrapper<PlatUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<PlatUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -1052,8 +1054,8 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
                 ExcelErrorVo.isNotNull(dto.getMobile(),errorVoList,start+i,"手机号*");
                 ExcelErrorVo.isNotNull(dto.getMobile(),errorVoList,start+i,"手机号*");
                 ExcelErrorVo.isNotNull(dto.getRoleName(),errorVoList,start+i,"*角色");
                 ExcelErrorVo.isNotNull(dto.getRoleName(),errorVoList,start+i,"*角色");
                 ExcelErrorVo.isNotNull(dto.getOrgName(),errorVoList,start+i,"*所属组织");
                 ExcelErrorVo.isNotNull(dto.getOrgName(),errorVoList,start+i,"*所属组织");
-
-                ExcelErrorVo.notExists(orgNameMap.get(dto.getOrgName()),errorVoList,start+i,"*所属组织");
+                PlatOrg platOrg = Optional.ofNullable(orgNameMap.get(dto.getOrgName())).orElse(new PlatOrg());
+                ExcelErrorVo.notExists( platOrg.getId(),errorVoList,start+i,"*所属组织");
                 ExcelErrorVo.notExists(roleNameMap.get(dto.getRoleName()),errorVoList,start+i,"*角色");
                 ExcelErrorVo.notExists(roleNameMap.get(dto.getRoleName()),errorVoList,start+i,"*角色");
                 ExcelErrorVo.exists(mobileMap,mobileMap.get(dto.getMobile()),errorVoList,start+i,"手机号*");
                 ExcelErrorVo.exists(mobileMap,mobileMap.get(dto.getMobile()),errorVoList,start+i,"手机号*");
                 ExcelErrorVo.exists(emailMap,emailMap.get(dto.getEmail()),errorVoList,start+i,"邮箱");
                 ExcelErrorVo.exists(emailMap,emailMap.get(dto.getEmail()),errorVoList,start+i,"邮箱");
@@ -1067,6 +1069,9 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
                     platUser.setTenantId(TenantIdUtil.getTenantId());
                     platUser.setTenantId(TenantIdUtil.getTenantId());
                     platUser.setAccount(platUser.getMobile());
                     platUser.setAccount(platUser.getMobile());
                     platUser.setIsTenant(CommonEnum.NO.getValue());
                     platUser.setIsTenant(CommonEnum.NO.getValue());
+                    PlatOrg platOrg = Optional.ofNullable(orgNameMap.get(vo.getOrgName())).orElse(new PlatOrg());
+                    platUser.setOrgId(platOrg.getId());
+                    platUser.setOrgPath(platOrg.getPath()+","+platOrg.getId());
                     platUsers.add(platUser);
                     platUsers.add(platUser);
                 });
                 });