From 9748f3f74f9f5d49d23528e9005bd82577591992 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 10 四月 2024 18:24:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

---
 server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index af6dc52..e86801e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -785,9 +785,10 @@
         if(Constants.equalsInteger(company.getType(),Constants.ONE)){
 //                return new ArrayList<>();
         }else  {
+            company.setType(Constants.ZERO);
             if(Constants.equalsInteger(user.getType(),Constants.TWO)){
                 //濡傛灉鏄晢鎴�
-                wrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.shop_id=company.id");//璁剧疆鏃犳晥璁块棶
+                wrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.company_id=company.id and  c.shop_id="+user.getCompanyId());//璁剧疆鏃犳晥璁块棶
             }else{
                 //濡傛灉鏌ヨ浼佷笟鏁版嵁
                 if(company.getQueryFlag() == 0){

--
Gitblit v1.9.3