fix org bug

sample/src/main/java/com/dji/sample/manage/controller/OrgController.java

@@ -57,11 +57,6 @@ public class OrgController {
                                          @RequestParam(defaultValue = "1") Long page,
                                          @RequestParam(defaultValue = "1") Long page,
                                          @RequestParam(value = "page_size", defaultValue = "50") Long pageSize) {
                                          @RequestParam(value = "page_size", defaultValue = "50") Long pageSize) {
 
 
-        // 判断权限 系统管理员才允许全查
-        if (!aboveSysAdminRole()) {
-            param.setOrgId(getOrgId());
-        }
-
         PaginationData<OrgDTO> workspacePage = orgService.getOrgPage(param, page, pageSize);
         PaginationData<OrgDTO> workspacePage = orgService.getOrgPage(param, page, pageSize);
 
 
         return HttpResultResponse.success(workspacePage);
         return HttpResultResponse.success(workspacePage);

sample/src/main/java/com/dji/sample/manage/service/impl/OrgServiceImpl.java

@@ -326,6 +326,22 @@ public class OrgServiceImpl extends ServiceImpl<IOrgMapper, OrgEntity> implement
             orgQueryWrapper.like(OrgEntity::getOrgDesc, param.getOrgDesc());
             orgQueryWrapper.like(OrgEntity::getOrgDesc, param.getOrgDesc());
         }
         }
 
 
+        if (aboveSysAdminRole()) {
+
+        } else {
+            // 查询相关组织
+            LambdaQueryWrapper<UserOrgEntity> userOrgQueryWrapper = new LambdaQueryWrapper<>();
+            userOrgQueryWrapper.eq(UserOrgEntity::getUserId, getUserId());
+            // userOrgQueryWrapper.eq(UserOrgEntity::getWorkspaceId, getWorkspaceId());
+            List<UserOrgEntity> userOrgEntities = userOrgService.list(userOrgQueryWrapper);
+
+            List<String> userOrgOrgIdList = userOrgEntities.stream().map(UserOrgEntity::getOrgId).distinct().collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(userOrgOrgIdList)) {
+                return new PaginationData<>();
+            }
+            orgQueryWrapper.in(OrgEntity::getOrgId, userOrgOrgIdList);
+        }
+
         Page<OrgEntity> pagination = this.page(new Page<>(page, pageSize), orgQueryWrapper);
         Page<OrgEntity> pagination = this.page(new Page<>(page, pageSize), orgQueryWrapper);
         List<OrgDTO> orgDTOList = pagination.getRecords().stream()
         List<OrgDTO> orgDTOList = pagination.getRecords().stream()
                 .map(this::entityConvertToDto)
                 .map(this::entityConvertToDto)

sample/src/main/java/com/dji/sample/manage/service/impl/UserOrgServiceImpl.java

@@ -16,6 +16,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
+import static com.dji.sample.common.util.SecurityUtils.getWorkspaceId;
+
 @Service
 @Service
 public class UserOrgServiceImpl extends ServiceImpl<IUserOrgMapper, UserOrgEntity> implements IUserOrgService {
 public class UserOrgServiceImpl extends ServiceImpl<IUserOrgMapper, UserOrgEntity> implements IUserOrgService {
 
 
@@ -88,6 +90,7 @@ public class UserOrgServiceImpl extends ServiceImpl<IUserOrgMapper, UserOrgEntit
         // 创建新关联
         // 创建新关联
         UserOrgEntity userOrg = new UserOrgEntity();
         UserOrgEntity userOrg = new UserOrgEntity();
         userOrg.setUserId(userId);
         userOrg.setUserId(userId);
+        userOrg.setWorkspaceId(getWorkspaceId());
         userOrg.setOrgId(orgId);
         userOrg.setOrgId(orgId);
         userOrg.setRoleType(roleType);
         userOrg.setRoleType(roleType);
         userOrg.setStatus(1);
         userOrg.setStatus(1);