sso

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/pojo/vo/DirectoryVO.java

@@ -37,4 +37,6 @@ public class DirectoryVO {
 
     private DirectorySync sync;
 
+    private String msGroupIds;
+
 }

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/pojo/vo/VppTeamVO.java

@@ -83,5 +83,7 @@ public class VppTeamVO {
      */
     @ExcelIgnore
     private Integer isChange;
+    @ExcelIgnore
+    private Integer type;
 
 }

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/DirectoryServiceImpl.java

@@ -67,7 +67,9 @@ public class DirectoryServiceImpl implements DirectoryService {
         for (Directory directory : directories) {
             DirectoryVO directoryVO = new DirectoryVO();
             BeanUtils.copyProperties(directory, directoryVO);
-
+            if (!StringUtils.isEmpty(directory.getMsGroupIds())){
+                directoryVO.setMsGroupIds(directory.getMsGroupIds());
+            }
             //根据目录id查询目录下的域名列表
             List<Domain> domains = domainService.listByDirectoryId(directory.getDirectoryId());
             directoryVO.setDomains(domains);

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/SyncServiceImpl.java

@@ -214,8 +214,11 @@ public class SyncServiceImpl implements SyncService {
         }
         try {
             DomainCollectionResponse domainCollectionResponse =  graphClient.domains().get();
-            List<String> domainList = domainCollectionResponse.getValue().stream().map(com.microsoft.graph.models.Domain::getId).collect(Collectors.toList());
-            if(!domainList.contains(list.get(0).getDomain())){
+            List<String> domainList = domainCollectionResponse.getValue()
+                    .stream()
+                    .map(domain -> domain.getId().toLowerCase()) // 将ID转换为小写
+                    .collect(Collectors.toList());
+            if(!domainList.contains(list.get(0).getDomain().toLowerCase())){
                 throw new BackendRuntimeException(SSOConstant.DOMAIN_NOT_EXIST);
             }
         }catch (Exception e){

pdf-tech-core/src/main/resources/sqlmap/ext/ExtVppTeamMapper.xml

@@ -15,7 +15,7 @@
   </resultMap>
 
   <select id="getManageTeamList" resultType="cn.kdan.pdf.tech.core.pojo.vo.VppTeamVO">
-    select id, name, license_amount licenseAmount, description description, create_time createTime from vpp_team
+    select id, name, license_amount licenseAmount, description description, create_time createTime , type from vpp_team
     where valid_flag = '1' and company_id = #{companyId}
     <if test="teamId != null and teamId != ''">
       and id = #{teamId}