From a7a3e876c467a401ecec1a084acb8edc0927d10b Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 17 六月 2025 13:36:04 +0800
Subject: [PATCH] 1.修改检索nc文件bug 2.新增刀具列表查询接口 3.程序加工确认表确认流程
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DataImportService.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 98dc0d9..2334052 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
@@ -287,20 +287,22 @@
private void savePermissionStreamNewList(List<PermissionStreamNew> permissionStreamNewList) {
for (PermissionStreamNew permissionStreamNew : permissionStreamNewList) {
- if (permissionStreamNew.getUserId() != null) {
- String id=sysUserService.getUserByName(permissionStreamNew.getUserId()).getId();
- if (id!=null){
- permissionStreamNew.setUserId(id);
+ if (permissionStreamNewMapper.selectById(permissionStreamNew.getId()) == null) {
+ if (permissionStreamNew.getUserId() != null) {
+ String id=sysUserService.getUserByName(permissionStreamNew.getUserId()).getId();
+ if (id!=null){
+ permissionStreamNew.setUserId(id);
+ }
}
- }
- if (permissionStreamNew.getDepartId() != null) {
- String id=mdcProductionService.findByOrgCode(permissionStreamNew.getDepartId()).getId();
- if (id!=null){
- permissionStreamNew.setDepartId(id);
+ if (permissionStreamNew.getDepartId() != null) {
+ String id=mdcProductionService.findByOrgCode(permissionStreamNew.getDepartId()).getId();
+ if (id!=null){
+ permissionStreamNew.setDepartId(id);
+ }
}
+ permissionStreamNewMapper.insert(permissionStreamNew);
+ logger.debug("鏉冮檺宸蹭繚瀛�: {}", permissionStreamNew.getId());
}
- permissionStreamNewMapper.insert(permissionStreamNew);
- logger.debug("鏉冮檺宸蹭繚瀛�: {}", permissionStreamNew.getId());
}
//鍒嗘壒娣诲姞浜у搧銆侀儴浠躲�侀浂浠躲�佸伐鑹鸿绋嬨�佸伐搴忋�佸伐姝ユ潈闄�
permissionStreamNewList.forEach(item -> {
--
Gitblit v1.9.3