From f3a7d211a4a616d8ed2a08b103d8d162f06d389e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 八月 2025 17:23:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java
index 0f183e4..1b89f6f 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java
@@ -182,14 +182,13 @@
validateParams(stream);
DocInfo docInfo = getDocInfo(stream);
MdcEquipment mdcEquipment = getMdcEquipment(stream);
- DocFile docFile = docFileService.getById(stream.getFileId());
DocInfo deviceDoc = docInfoService.getByDocAttrAndDocId(stream.getDocId(), 7, stream.getDeviceId());
if (deviceDoc != null) {
- handleExistingDeviceDoc(docInfo,docFile, mdcEquipment, stream.getDeviceId());
+ return Result.error("瀛樺湪鐩稿悓鏂囨。,涓嶅厑璁搁噸澶嶆寚娲撅紝璇峰垹闄ゅ悗鎸囨淳");
}
deviceDoc = docInfoService.findByAttrAndDocName(docInfo.getDocName(), 7, stream.getDeviceId());
if (deviceDoc != null) {
- handleExistingDeviceDoc(docInfo,docFile, mdcEquipment, stream.getDeviceId());
+ return Result.error("瀛樺湪鐩稿悓鏂囨。,涓嶅厑璁搁噸澶嶆寚娲撅紝璇峰垹闄ゅ悗鎸囨淳");
}
PermissionStreamNew permissionStreams = getPermissionStreams(stream);
if (permissionStreams==null){
--
Gitblit v1.9.3