From e63e56a1b45bc2025147f7f91d248f93a43deb7a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 12 四月 2024 15:10:41 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 99e04df..076bb39 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
@@ -370,12 +370,13 @@
         if(solutions.getDataType() == null){
             solutions.setDataType(Constants.TWO);
         }
+        QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions);
         if(Constants.equalsObject(user.getType(),Constants.TWO)){
             //濡傛灉鏄垹闄�
-            solutions.setShopId(user.getCompanyId());
+//                wrapper.lambda().exists("select c.id from company_solution c left join solutions d on c.solution_id=d.id where c.isdeleted=0 and d.base_id=solutions.base_id and c.shop_id="+user.getCompanyId());//璁剧疆鏃犳晥璁块棶
+                wrapper.apply("((solutions.type=0 and exists(select cs.id from company_solution cs left join solutions s on cs.solution_id=s.id where cs.isdeleted=0 and s.base_id=solutions.base_id and cs.shop_id="+user.getCompanyId()+")) or (" +
+                        "solutions.type=1 and solutions.shop_id="+user.getCompanyId()+"))") ;
         }
-        QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions);
-
         return solutionsMapper.selectList(wrapper);
     }
   

--
Gitblit v1.9.3