Update Org

Author: yunomix2834

FileService/.idea/.idea.FileService/.idea/workspace.xml

@@ -38,15 +38,23 @@ Page<OrganizationMember> findByScopeTypeAndScopeIdAndIsActiveIsTrue(
       ScopeType scopeType, String scopeId, Pageable pageable);
 
   // Đếm số membership ACTIVE cấp Organization của user
-  @Query("select count(m) from OrganizationMember m " +
-      "where m.userId = :userId and m.scopeType = com.codecampus.constant.ScopeType.Organization " +
-      "and m.isActive = true")
+  @Query("""
+      select count(m) from OrganizationMember m, Organization o
+       where m.userId = :userId
+         and m.scopeType = com.codecampus.constant.ScopeType.Organization
+         and m.isActive = true
+         and o.id = m.scopeId
+      """)
   long countActiveOrganizations(@Param("userId") String userId);
 
   // Lấy tất cả membership ACTIVE của user ở cấp Organization
-  @Query("select m from OrganizationMember m " +
-      "where m.userId = :userId and m.scopeType = com.codecampus.constant.ScopeType.Organization " +
-      "and m.isActive = true")
+  @Query("""
+      select m from OrganizationMember m, Organization o
+       where m.userId = :userId
+         and m.scopeType = com.codecampus.constant.ScopeType.Organization
+         and m.isActive = true
+         and o.id = m.scopeId
+      """)
   List<OrganizationMember> findActiveOrgsOfUser(@Param("userId") String userId);
 
   // Lấy tất cả member ACTIVE của 1 org

org-service/src/main/java/com/codecampus/organization/repository/OrganizationMemberRepository.java

@@ -65,7 +65,6 @@ public void addToOrg(
       String role,
       boolean active) {
 
-
     auth.ensureRoleAtLeastForOrg(orgId, OrgAuthorization.OrgRole.ADMIN);
 
     List<OrganizationMember> actives =