From 463f4334cf41a30348067f5d5b3cf288c19c0eba Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 24 一月 2024 14:54:03 +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, 8 insertions(+), 0 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 e8a4fdb..432e677 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
@@ -12,6 +12,7 @@
import com.doumee.dao.business.SolutionsMapper;
import com.doumee.dao.business.WorktypeMapper;
import com.doumee.dao.business.join.SolutionWorktypeJoinMapper;
+import com.doumee.dao.business.join.SolutionsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.SolutionsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -29,6 +30,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.UUID;
/**
@@ -41,6 +43,8 @@
@Autowired
private SolutionsMapper solutionsMapper;
+ @Autowired
+ private SolutionsJoinMapper solutionsJoinMapper;
@Autowired
private WorktypeMapper worktypeMapper;
@Autowired
@@ -250,6 +254,7 @@
@Override
public List<Solutions> findList(Solutions solutions) {
solutions.setIsdeleted(Constants.ZERO);
+ solutions.setDataType(Constants.TWO);
QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions);
return solutionsMapper.selectList(wrapper);
}
@@ -393,4 +398,7 @@
QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions);
return solutionsMapper.selectCount(wrapper);
}
+
+
+
}
--
Gitblit v1.9.3