更新！

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

@@ -85,10 +85,12 @@ public class CardInfoPoolService extends SuperService {
             return ResultContent.buildFail(String.format("机构不存在：%s", param.getOid()));
         }
         param.setCode(param.getCode().toUpperCase());
+
         OidAboutInfo oidAboutInfo = organizationManagerService.getOidAboutInfo(oid);
         String projectOid = oidAboutInfo.getProjectOid();
         // 项目唯一
-        CardInfoPool temp = cardInfoPoolDao.findTopByCodeAndProjectOid(param.getCode(), projectOid);
+//        CardInfoPool temp = cardInfoPoolDao.findTopByCodeAndProjectOid(param.getCode(), projectOid);
+        CardInfoPool temp = cardInfoPoolDao.findTopByCode(param.getCode());
         if (StringUtils.isNotEmpty(param.getId())) {
             entity = cardInfoPoolDao.findTopById(param.getId());
             if (ObjectUtils.isEmpty(entity)) {
@@ -107,7 +109,6 @@ public class CardInfoPoolService extends SuperService {
             initEntityNoCheckOid(entity);
         }
         BeanUtils.copyProperties(param, entity, "isUsed");
-
         entity.setOid(oid);
         entity.setProjectOid(projectOid);
         entity.setAboutAuthType(oidAboutInfo.getAuthType());
@@ -258,9 +259,9 @@ public class CardInfoPoolService extends SuperService {
                     }
 
                     // 检查是否已存在 code
-                    boolean exit = cardInfoPoolDao.existsByCode(param1.getCode());
+                    boolean exit = cardInfoPoolDao.existsByCode(code);
                     if (exit) {
-                        failDetails.add(String.format("第%d行卡号%s已存在", startRow, param1.getCode()));
+                        failDetails.add(String.format("第%d行卡号%s已存在", startRow, code));
                         continue;
                     }
 
@@ -363,9 +364,12 @@ public class CardInfoPoolService extends SuperService {
         if (StringUtils.isEmpty(param.getCode())) {
             return ResultContent.buildSuccess(Lists.newArrayList());
         }
-
+        String projectOid = param.getProjectOid();
+        if (StringUtils.isEmpty(projectOid)) {
+            projectOid = getCurrentProjectOid();
+        }
         // 查询前十的卡片数据
-        List<CardInfoPool> list = cardInfoPoolDao.findTop10ByProjectOidAndCodeLikeAndIsUsedAndCardCancelState(param.getProjectOid(), param.getCode(), Boolean.FALSE, CardCancelState.Common);
+        List<CardInfoPool> list = cardInfoPoolDao.findTop10ByProjectOidAndCodeLikeAndIsUsedAndCardCancelState(projectOid, param.getCode(), Boolean.FALSE, CardCancelState.Common);
         List<CardInfoPoolSimpleModel> models = new ArrayList<>();
         if (ObjectUtils.isNotEmpty(list)) {
             models = list.stream().map(this::toSimpleModel).collect(Collectors.toList());