From 41a0e3b18e0b3ca51879d11b9c3c6f278486f631 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 23 二月 2024 11:46:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 6 ++++++
1 files changed, 6 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 75e4954..ebac33f 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
@@ -451,11 +451,17 @@
List<Solutions> solutionsList = solutionsJoinMapper.selectJoinList(Solutions.class,new MPJLambdaWrapper<Solutions>()
.selectAll(Solutions.class)
.leftJoin(CompanySolution.class,CompanySolution::getSolutionId,Solutions::getId)
+ .leftJoin(Company.class,Company::getId,CompanySolution::getCompanyId)
+ .leftJoin(Insurance.class,Insurance::getId,Solutions::getInsuranceId)
.eq(Solutions::getIsdeleted,Constants.ZERO)
.eq(Solutions::getStatus,Constants.ZERO)
.eq(Solutions::getDataType,dataType)
.eq(CompanySolution::getIsdeleted,Constants.ZERO)
.eq(CompanySolution::getCompanyId,user.getCompanyId())
+ .eq(Company::getIsdeleted,Constants.ZERO)
+ .eq(Company::getStatus,Constants.ZERO)
+ .eq(Insurance::getIsdeleted,Constants.ZERO)
+ .eq(Insurance::getStatus,Constants.ZERO)
.orderByAsc(Solutions::getSortnum)
);
return solutionsList;
--
Gitblit v1.9.3