From 05cf6324ea8322164d99a3d3d4161fe374534b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
index faa93b4..97467cd 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
@@ -190,8 +190,9 @@
.eq(Solutions::getBaseId,solutions.getId())
.eq(Solutions::getDataType,Constants.TWO)
.set(Solutions::getDataType,Constants.ONE)
+ .set(StringUtils.isNotBlank(solutions.getSignKeyword()),Solutions::getSignKeyword,solutions.getSignKeyword())
);
- //澶勭悊宸ヤ綔淇℃伅锛屾柊澧炴渶鏂扮殑锛屽悓鏃朵骇鐢熷巻鍙茬増鏈�
+ //澶勭悊宸ョ淇℃伅锛屾柊澧炴渶鏂扮殑锛屽悓鏃朵骇鐢熷巻鍙茬増鏈�
dealWorkType(solutions,newModel,solutions.getWorktypeIdList(),false);
}
@@ -261,6 +262,7 @@
@Override
public List<Solutions> findList(Solutions solutions) {
solutions.setIsdeleted(Constants.ZERO);
+ solutions.setStatus(Constants.ZERO);
if(solutions.getDataType() == null){
solutions.setDataType(Constants.TWO);
}
@@ -357,9 +359,7 @@
if (pageWrap.getModel().getOrtherInfo() != null) {
queryWrapper.eq(Solutions::getOrtherInfo, pageWrap.getModel().getOrtherInfo());
}
- if (pageWrap.getModel().getSolutionBaseId() != null) {
- queryWrapper.eq(Solutions::getSolutionBaseId, pageWrap.getModel().getSolutionBaseId());
- }
+
if (pageWrap.getModel().getVersion() != null) {
queryWrapper.eq(Solutions::getVersion, pageWrap.getModel().getVersion());
}
--
Gitblit v1.9.3