From e6e520abd96702db6b29459a66440801f58bc89d Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 30 一月 2026 14:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbom_dianjiang
---
server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
index 778f95c..1503157 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
@@ -234,6 +234,7 @@
List<Member> insertMember = new ArrayList<>();
List<Member> allList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
.eq(Member::getDeleted,Constants.ZERO));
+ allList=allList==null?new ArrayList<>():allList;
if(categoryList == null || categoryList.size()==0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝 璇诲彇鑰佸笀鍩烘暟鏁版嵁閰嶇疆鍑洪敊锛岃鍏堥厤缃熀纭�鏁版嵁淇℃伅锛�");
}
@@ -323,6 +324,7 @@
member.setCreateUser(user.getId());
member.setUpdateUser(user.getId());
member.setAddType(Constants.ONE);
+ member.setDeleted(Constants.ZERO);
member.setStatus(Constants.ZERO);
member.setName(param.getName());
member.setContent(param.getInfo());
@@ -446,6 +448,8 @@
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.ACCESS_ID).getCode(),
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.ACCESS_KEY).getCode());
for(Member param: importRecord.getMemberList()){
+ param.setImportId(importRecord.getId());
+ param.setAddType(Constants.ONE);
success += dealMemberInsert(obs,param,folder,nowDate,bucket);
}
obs.shutDown();
--
Gitblit v1.9.3