From 0a44ea9a5056081f1e759248a526929c9cf5e5ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”>
Date: Tue, 15 Apr 2025 21:17:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=9C=80=E6=B1=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kms/yxgh/df/service/DfCheckingV2Service.java     | 9 +++++----
 .../com/kms/yxgh/dw/service/DwCheckingV2Service.java     | 8 ++++----
 .../com/kms/yxgh/sz/service/SzCheckingV2Service.java     | 9 +++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java
index 367fde38..a6b29198 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java
@@ -21,6 +21,7 @@ import com.kms.yxgh.df.mapper.DfCheckingV2Mapper;
 import com.kms.yxgh.util.BeanCopyUtils;
 import com.kms.yxgh.util.StreamUtils;
 import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.domain.entity.SysUser;
 import com.shuili.common.core.service.BaseService;
 import com.shuili.common.utils.BeanUtils;
 import lombok.AllArgsConstructor;
@@ -223,17 +224,17 @@ public class DfCheckingV2Service extends BaseService<DfCheckingV2Mapper, DfCheck
 
     public DfProReceiveFeedbackV2Dto projectReceiveFeedback() {
         DfProReceiveFeedbackV2Dto receiveV2Dto = new DfProReceiveFeedbackV2Dto();
-        String userId = UserUtils.getUserId();
-        if (null == userId) {
+        SysUser user = UserUtils.getUser();
+        if (null == user) {
             return receiveV2Dto;
         }
         List<BsSgcDfManateam> list = bsSgcDfManateamService.list(new LambdaQueryWrapper<BsSgcDfManateam>()
-                        .eq(BsSgcDfManateam::getCreateUid, userId)
+                        .eq(StringUtils.isNotBlank(user.getPhonenumber()),BsSgcDfManateam::getPhone, user.getPhonenumber())
                 );
-        list = StreamUtils.distinctByKeyFast(list, BsSgcDfManateam::getDikeCode);
         if (CollectionUtils.isEmpty(list)) {
             return receiveV2Dto;
         }
+        list = StreamUtils.distinctByKeyFast(list, BsSgcDfManateam::getDikeCode);
         receiveV2Dto.setUnitList(BeanCopyUtils.copyList(list, DfProReceiveFeedbackV2Dto.DfTeamUnitV2Dto.class));
         List<DfCheckingV2ProjectManage> manageList =
                 this.baseMapper.selectList(new LambdaQueryWrapper<DfCheckingV2ProjectManage>()
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java
index 96198a92..d27061d7 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java
@@ -232,16 +232,16 @@ public class DwCheckingV2Service extends BaseService<DwCheckingV2Mapper, DwCheck
     public DwProReceiveFeedbackV2Dto projectReceiveFeedback() {
         DwProReceiveFeedbackV2Dto receiveV2Dto = new DwProReceiveFeedbackV2Dto();
         SysUser user = UserUtils.getUser();
-        if (Objects.isNull(user)) {
+        if (null == user) {
             return receiveV2Dto;
         }
-        String userId = user.getId();
         List<BsSgcDfManateam> list = bsSgcDfManateamService.list(new LambdaQueryWrapper<BsSgcDfManateam>()
-                .eq(BsSgcDfManateam::getCreateUid, userId));
-        list = StreamUtils.distinctByKeyFast(list, BsSgcDfManateam::getDikeCode);
+                .eq(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(user.getPhonenumber()),BsSgcDfManateam::getPhone, user.getPhonenumber())
+        );
         if (CollectionUtils.isEmpty(list)) {
             return receiveV2Dto;
         }
+        list = StreamUtils.distinctByKeyFast(list, BsSgcDfManateam::getDikeCode);
         receiveV2Dto.setUnitList(BeanCopyUtils.copyList(list, DwProReceiveFeedbackV2Dto.DwTeamUnitV2Dto.class));
         List<DwCheckingV2ProjectManage> manageList =
                 this.baseMapper.selectList(new LambdaQueryWrapper<DwCheckingV2ProjectManage>()
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java
index 8a8cf0c7..e4703a70 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.common.utils.UserUtils;
+import com.kms.yg.df.domain.BsSgcDfManateam;
 import com.kms.yg.sz.domain.BsSgcSzManateam;
 import com.kms.yg.sz.service.BsSgcSzManateamService;
 import com.kms.yxgh.df.service.DfCheckingV2Service;
@@ -226,16 +227,16 @@ public class SzCheckingV2Service extends BaseService<SzCheckingV2Mapper, SzCheck
     public SzProReceiveFeedbackV2Dto projectReceiveFeedback() {
         SzProReceiveFeedbackV2Dto receiveV2Dto = new SzProReceiveFeedbackV2Dto();
         SysUser user = UserUtils.getUser();
-        if (Objects.isNull(user)) {
+        if (null == user) {
             return receiveV2Dto;
         }
-        String userId = user.getId();
         List<BsSgcSzManateam> list = bsSgcSzManateamService.list(new LambdaQueryWrapper<BsSgcSzManateam>()
-                .eq(BsSgcSzManateam::getCreateUid, userId));
-        list = StreamUtils.distinctByKeyFast(list, BsSgcSzManateam::getWagaCode);
+                .eq(StringUtils.isNotBlank(user.getPhonenumber()),BsSgcSzManateam::getPhone, user.getPhonenumber())
+        );
         if (CollectionUtils.isEmpty(list)) {
             return receiveV2Dto;
         }
+        list = StreamUtils.distinctByKeyFast(list, BsSgcSzManateam::getWagaCode);
         receiveV2Dto.setUnitList(BeanCopyUtils.copyList(list, SzProReceiveFeedbackV2Dto.SzTeamUnitV2Dto.class));
         List<SzCheckingV2ProjectManage> manageList =
                 this.baseMapper.selectList(new LambdaQueryWrapper<SzCheckingV2ProjectManage>()