三方商城导入

2 months ago · 356798dee8
1 changed files with 1 additions and 1 deletions
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTripartiteMallServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTripartiteMallServiceImpl.java
@ -284,7 +284,7 @@ public class BasicdataTripartiteMallServiceImpl extends BaseServiceImpl<Basicdat
 		for (BasicdataTripartiteMallExcel datum : data) {
 			List<BasicdataTripartiteMallEntity> entities = this.list(Wrappers.<BasicdataTripartiteMallEntity>query().lambda()
 				.eq(BasicdataTripartiteMallEntity::getTripartiteMall, datum.getTripartiteMall())
-				.eq(BasicdataTripartiteMallEntity::getTripartiteCoding, datum.getTripartiteCoding())
+				.eq(!Objects.isNull(datum.getTripartiteCoding()),BasicdataTripartiteMallEntity::getTripartiteCoding,datum.getTripartiteCoding())
 				.eq(BasicdataTripartiteMallEntity::getBrandName, datum.getBrandName())
 			);
 			if (!entities.isEmpty()) {