From a5db704a76c5a89693c525cc20b033bc7eaaff29 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Mon, 3 Jun 2024 19:45:57 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml | 4 ----
 .../modules/xz/service/impl/XzTaskProgressServiceImpl.java   | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml
index 8cfd3cb02..28c899d9c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml
@@ -176,10 +176,6 @@
             AND (p.quality_region_id = #{qualityRegionId} OR p.quality_region_id IN ( SELECT t.id FROM quality_region t
             WHERE find_in_set(#{qualityRegionId}, ancestors) ))
         </if>
-        <if test="enterpriseId != null and enterpriseId != ''">
-            AND (p.enterprise_id = #{enterpriseId} OR p.enterprise_id IN ( SELECT t.id FROM project_enterprise t WHERE
-            find_in_set(#{enterpriseId}, ancestors) ))
-        </if>
         <if test="supplierEnterpriseId != null and supplierEnterpriseId != ''">
             AND (p.enterprise_id = #{supplierEnterpriseId} OR p.enterprise_id IN ( SELECT t.id FROM project_enterprise t
             WHERE find_in_set(#{supplierEnterpriseId}, ancestors) ))
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java
index 519a160b0..48450bb70 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java
@@ -570,11 +570,6 @@ public class XzTaskProgressServiceImpl extends ServiceImpl<XzTaskProgressMapper,
         } else {
             vo.setEnterpriseTotalProgress(0D);
         }
-
-        if (systemUserService.isSupplier()) {
-            EnterpriseInfo info = xzSupplierQualificationApplyService.getSupplierInfoByUserId(SecurityUtils.getUser().getUserId());
-            paramMap.put("supplierEnterpriseId", info.getId());
-        }
         CountTaskProgressVo vo1 = baseMapper.getMaxMinProgress(paramMap);
         vo.setProjectTotalDayNum(vo1.getProjectTotalDayNum());
         vo.setProjectSurplusDayNum(vo1.getProjectSurplusDayNum());