From d91d0a59df67ad1f8766208fb4e9feb1b3533acc Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Thu, 30 May 2024 16:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=9B=E5=BA=A6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/XzTaskProgressTotalServiceImpl.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java
index 72e5f6ed7..3c6ed8a74 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java
@@ -12,12 +12,14 @@ import com.zhgd.xmgl.modules.xz.mapper.XzTaskProgressTotalMapper;
 import com.zhgd.xmgl.modules.xz.service.IXzTaskProgressTotalService;
 import com.zhgd.xmgl.util.PageUtil;
 import com.zhgd.xmgl.util.RefUtil;
+import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @Description: 星纵-任务进度总进度
@@ -48,6 +50,10 @@ public class XzTaskProgressTotalServiceImpl extends ServiceImpl<XzTaskProgressTo
 
     private QueryWrapper<XzTaskProgressTotal> getQueryWrapper(HashMap<String, Object> paramMap) {
         String alias = "";
+        Integer type = MapUtils.getInteger(paramMap, "type");
+        if (Objects.equals(type, 1)) {
+            paramMap.remove("enterpriseId");
+        }
         QueryWrapper<XzTaskProgressTotal> queryWrapper = QueryGenerator.initPageQueryWrapper(XzTaskProgressTotal.class, paramMap, alias);
         queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzTaskProgressTotal::getCreateDate));
         return queryWrapper;
@@ -65,6 +71,9 @@ public class XzTaskProgressTotalServiceImpl extends ServiceImpl<XzTaskProgressTo
                 .orderByDesc(XzTaskProgressTotal::getCreateDate)
                 .last("limit 1")
         );
+        if (Objects.equals(xzTaskProgressTotal.getType(), 1)) {
+            xzTaskProgressTotal.setEnterpriseId(null);
+        }
         if (total != null) {
             xzTaskProgressTotal.setChangeBefore(total.getChangeAfter());
         } else {
@@ -80,6 +89,9 @@ public class XzTaskProgressTotalServiceImpl extends ServiceImpl<XzTaskProgressTo
         if (xzTaskProgressTotal1 == null) {
             throw new OpenAlertException("未找到对应实体");
         }
+        if (Objects.equals(xzTaskProgressTotal.getType(), 1)) {
+            xzTaskProgressTotal.setEnterpriseId(null);
+        }
         baseMapper.updateById(xzTaskProgressTotal);
     }