From 9dc0d681e17d735ff42195a29e6905f4ee9f01da Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 六月 2025 09:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java
index fe919a1..5641958 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java
@@ -157,10 +157,10 @@
if(StringUtils.isBlank(solutionsBase.getName())||
StringUtils.isBlank(solutionsBase.getCompanyName())
|| Objects.isNull(solutionsBase.getValidType())
- || Objects.isNull(solutionsBase.getCanAdd())
- || Objects.isNull(solutionsBase.getCanReduce())
- || Objects.isNull(solutionsBase.getCanChangeUnit())
- || Objects.isNull(solutionsBase.getDelOnlyReplace())
+// || Objects.isNull(solutionsBase.getCanAdd())
+// || Objects.isNull(solutionsBase.getCanReduce())
+// || Objects.isNull(solutionsBase.getCanChangeUnit())
+// || Objects.isNull(solutionsBase.getDelOnlyReplace())
|| Objects.isNull(solutionsBase.getAddValidDays())
|| Objects.isNull(solutionsBase.getDelValidDays())
|| Objects.isNull(solutionsBase.getInsuranceId())
@@ -444,11 +444,14 @@
@Override
public List<SolutionsBase> findList(SolutionsBase solutionsBase) {
QueryWrapper<SolutionsBase> wrapper = new QueryWrapper<>();
+ wrapper.lambda().select(SolutionsBase::getId,SolutionsBase::getName);
wrapper.lambda().eq(SolutionsBase::getDataType,Constants.ZERO);
wrapper.lambda().eq(SolutionsBase::getIsdeleted,Constants.ZERO);
return solutionsBaseMapper.selectList(wrapper);
}
+
+
@Override
public PageData<SolutionsBase> findPage(PageWrap<SolutionsBase> pageWrap) {
IPage<SolutionsBase> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
--
Gitblit v1.9.3