sso

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/controller/VppMemberController.java

@@ -156,7 +156,7 @@ public class VppMemberController {
         if (ObjectUtils.isEmpty(member)) {
             throw new BackendRuntimeException(SSOConstant.EXCEPTION_MSG_MEMBER_NOT_EXIST);
         }
-        if (member.getValidFlag().equals(ValidStatusEnum.REVOKED.value())) {
+        if (member.getValidFlag().equals(ValidStatusEnum.REVOKED.value())||member.getIsSso().equals(ValidStatusEnum.INVALID.value())) {
             throw new BackendRuntimeException(SSOConstant.EXCEPTION_MSG_MEMBER_REVOKED);
         }
         Directory directory = directoryService.getById(member.getDirectoryId());

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

@@ -31,6 +31,6 @@ public class DirectorySyncServiceImpl implements DirectorySyncService {
 
     @Override
     public void update(DirectorySync directorySync) {
-        directorySyncMapper.updateByPrimaryKey(directorySync);
+        directorySyncMapper.updateByPrimaryKeySelective(directorySync);
     }
 }

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

@@ -265,7 +265,7 @@ public class SyncServiceImpl implements SyncService {
             }
         }
 
-        List<VppTeamMemberVO> localMembers = vppRTeamMemberRoleService.listForMember(teamId, RoleEnum.TEAM_MEMBER.code(), null, null, "1");
+        List<VppTeamMemberVO> localMembers = vppRTeamMemberRoleService.listForMember(teamId, null, null, null, "1");
         localMembers.stream()
                 .filter(member -> !microsoftEmails.contains(member.getEmail()))
                 .forEach(member -> vppRTeamMemberRoleService.deleteMember(member.getId()));

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

@@ -552,9 +552,9 @@ public class VppRTeamMemberRoleServiceImpl implements VppRTeamMemberRoleService
 
     @Override
     public List<VppTeamMemberVO> listForMember(String teamId, String status, String productCode, String queryString,String isSso) {
-        VppMember member = vppMemberService.getCurrentUser();
         List<String> teamIds = new ArrayList<>();
         if(ObjectUtils.isEmpty(teamId)){
+            VppMember member = vppMemberService.getCurrentUser();
             List<VppRTeamMemberRoleVO> list = listByMemberIdAdmin(member.getId());
             List<String> idList  = list.stream().map(VppRTeamMemberRoleVO::getTeamId).collect(Collectors.toList());
             teamIds = idList;
@@ -564,7 +564,7 @@ public class VppRTeamMemberRoleServiceImpl implements VppRTeamMemberRoleService
         if(CollectionUtils.isEmpty(teamIds)){
             throw new BackendRuntimeException(VppDeviceConstant.EXCEPTION_MSG_NO_TEAM);
         }
-        List<VppTeamMemberVO> vppTeamMemberVOS = vppRTeamMemberRoleMapper.listForMember(teamIds, member.getEmail(), queryString, status, productCode, isSso);
+        List<VppTeamMemberVO> vppTeamMemberVOS = vppRTeamMemberRoleMapper.listForMember(teamIds, null, queryString, status, productCode, isSso);
 
         for (VppTeamMemberVO vppTeamMemberVO : vppTeamMemberVOS) {
             if (StringUtils.isEmpty(vppTeamMemberVO.getProductNames())) {
@@ -614,6 +614,7 @@ public class VppRTeamMemberRoleServiceImpl implements VppRTeamMemberRoleService
         return vppRTeamMemberRoleMapper.selectByExample(example);
     }
 
+
     @Override
     public void removeSSOMembers(List<String> memberIds) {
         memberIds.forEach(memberId->{