更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/CardInfoServiceImpl.java

@@ -732,6 +732,15 @@ public class CardInfoServiceImpl extends SuperService implements CardInfoService
         return ResultContent.buildSuccess();
     }
 
+    public ResultContent getUserProjectAllCard(String userId, String projectOid) {
+        List<CardInfo> list = cardInfoDao.findByUserIdAndProjectOid(userId, projectOid);
+        List<CardInfoModel> models = new ArrayList<>(list.size());
+        if (ObjectUtils.isNotEmpty(list)) {
+            models = list.stream().map(this::toModel).collect(Collectors.toUnmodifiableList());
+        }
+        return ResultContent.buildSuccess(models);
+    }
+
     public List<CardInfo> getProjectCards(String projectOid, List<String> userIds) {
         if (StringUtils.isNotEmpty(projectOid) && ObjectUtils.isNotEmpty(userIds)) {
             return cardInfoDao.findByProjectOidAndUserIdInAndCardStateOrderByUpdateTimeDesc(projectOid, userIds, CardState.Enable);

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/SchoolUserServiceImpl.java

@@ -317,10 +317,7 @@ public class SchoolUserServiceImpl extends SuperService implements SchoolUserSer
      */
     @Override
     public ResultContent<List<CardInfoModel>> getCurrentUserAllCard() {
-        String userId = getCurrentUserId();
-        Assert.hasText(userId, "userId不能为空");
-        List<CardInfoModel> cardInfos = cardInfoService.getUserOrgAllCard(userId, null);
-        return ResultContent.buildSuccess(cardInfos);
+        return cardInfoService.getUserProjectAllCard(getCurrentUserId(), getCurrentProjectOid());
     }
 
     //-------------------------------卡片信息维护 end---------------------