Merge branch 'fu-dev' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmWorkContentServiceImpl.java

@@ -451,11 +451,11 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
             LambdaQueryWrapper<PmWorkContent> contentLambdaQuery = Wrappers.lambdaQuery();
             contentLambdaQuery.select(PmWorkContent::getReportId).eq(PmWorkContent::getProjectId, projectId);
             reportIds.addAll(pmWorkContentMapper.selectList(contentLambdaQuery).stream().map(PmWorkContent::getReportId).collect(Collectors.toList()));
+            if (reportIds.isEmpty()){
+                return returnPage;
+            }
         }
 
-        if (reportIds.isEmpty()){
-            return returnPage;
-        }
 
         List<PmWorkContent> pmWorkContentList = new ArrayList<>();
         // Integer tenantId = SecurityUtils.getTenantId();