From cf4fbcbf19c7d326611598c2fc90a4aeb354c4a5 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 21 十月 2026 15:06:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java
index c7f13bb..8790ea3 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodSearchNewServiceImpl.java
@@ -77,6 +77,9 @@
processMethodSearchNew.setStandardMethodId(null);
processMethodSearchNew.setCurrentAutoStandardId(null);
processMethodSearchNew.setAutoArchivedTime(null);
+ if (!Integer.valueOf(3).equals(processMethodSearchNew.getSearchNewSource())) {
+ processMethodSearchNew.setSearchNewWebsite(null);
+ }
}
// 鏂板
this.saveBatch(processMethodSearchNewList);
@@ -101,10 +104,30 @@
.set(ProcessMethodSearchNew::getNewMethodName, processMethodSearchNew.getNewMethodName())
.set(ProcessMethodSearchNew::getNewStandardNo, processMethodSearchNew.getNewStandardNo())
.set(ProcessMethodSearchNew::getSearchNewSource, processMethodSearchNew.getSearchNewSource())
+ .set(ProcessMethodSearchNew::getSearchNewTime, processMethodSearchNew.getSearchNewTime())
+ .set(ProcessMethodSearchNew::getSearchNewResult, processMethodSearchNew.getSearchNewResult())
+ .set(ProcessMethodSearchNew::getSearchNewWebsite,
+ Integer.valueOf(3).equals(processMethodSearchNew.getSearchNewSource())
+ ? processMethodSearchNew.getSearchNewWebsite() : null)
.set(ProcessMethodSearchNew::getRemark, processMethodSearchNew.getRemark())
.set(ProcessMethodSearchNew::getIsNewStandard, 1));
}
+ @Override
+ public boolean delMethodSearchNew(Integer methodSearchNewId) {
+ if (methodSearchNewId == null) {
+ throw new ErrorException("缂哄皯鏍囧噯鏌ユ柊璁板綍id");
+ }
+ ProcessMethodSearchNew old = getById(methodSearchNewId);
+ if (old == null) {
+ throw new ErrorException("鏍囧噯鏌ユ柊璁板綍涓嶅瓨鍦�");
+ }
+ if (Integer.valueOf(1).equals(old.getIsAutoArchived())) {
+ throw new ErrorException("鑷姩褰掓。璁板綍涓嶅厑璁稿垹闄�");
+ }
+ return removeById(methodSearchNewId);
+ }
+
/**
* 鏍囧噯鏌ユ柊鍒楄〃
*
--
Gitblit v1.9.3