From 4d6cf92e30c2c7f81f8cc31dfb7559a745782ec1 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 23 六月 2025 13:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java
index 2334052..3ddf601 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java
@@ -8,6 +8,7 @@
import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.mapper.*;
import org.jeecg.modules.dnc.service.*;
+import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.jeecg.modules.system.service.ISysUserService;
import org.slf4j.Logger;
@@ -295,9 +296,9 @@
}
}
if (permissionStreamNew.getDepartId() != null) {
- String id=mdcProductionService.findByOrgCode(permissionStreamNew.getDepartId()).getId();
- if (id!=null){
- permissionStreamNew.setDepartId(id);
+ MdcProduction mdcProduction=mdcProductionService.findByOrgCode(permissionStreamNew.getDepartId());
+ if (mdcProduction!=null){
+ permissionStreamNew.setDepartId(mdcProduction.getId());
}
}
permissionStreamNewMapper.insert(permissionStreamNew);
@@ -449,6 +450,7 @@
private void saveGuideCardBatch(GuideCardBatch guideCardBatch) {
if (guideCardBatchMapper.selectById(guideCardBatch.getId()) == null) {
+ guideCardBatch.setFlowStatus("1");
guideCardBatchMapper.insert(guideCardBatch);
logger.debug("鍒�鐗囨壒娆″凡淇濆瓨: {}", guideCardBatch.getId());
} else {
--
Gitblit v1.9.3