From 22594e714c57c9e243fe9973515ea9467d71c2db Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 07 十一月 2023 18:35:11 +0800
Subject: [PATCH] Changes11
---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java
index c9aba27..ba3b912 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java
@@ -27,11 +27,11 @@
import com.chinaztt.mes.basic.mapper.CompanyMapper;
import com.chinaztt.mes.basic.mapper.DivisionMapper;
import com.chinaztt.mes.basic.service.DivisionService;
-import com.chinaztt.ztt.common.core.util.R;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Objects;
/**
* 閮ㄩ棬
@@ -65,7 +65,14 @@
}
List<Company> companyList = companyMapper.selectList(null);
for (DivisionData data :list){
- Division division = new Division();
+ QueryWrapper<Division>QueryWrapper = new QueryWrapper<>();
+ QueryWrapper.lambda().eq(Division::getDivisionNo,data.getDivisionNo());
+ Division division1 = baseMapper.selectOne(QueryWrapper);
+ if(!Objects.isNull(division1)){
+ log.error("閮ㄩ棬缂栧彿閲嶅========銆�"+data.getDivisionNo());
+ continue;
+ }
+ Division division = new Division();
for (int i = 0; i <companyList.size() ; i++) {
if (companyList.get(i).getCompanyName().equals(data.getCompanyName())){
division.setCompanyId(companyList.get(i).getId());
--
Gitblit v1.9.3