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 list = bsSgcDfManateamService.list(new LambdaQueryWrapper() - .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 manageList = this.baseMapper.selectList(new LambdaQueryWrapper() 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 list = bsSgcDfManateamService.list(new LambdaQueryWrapper() - .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 manageList = this.baseMapper.selectList(new LambdaQueryWrapper() 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 list = bsSgcSzManateamService.list(new LambdaQueryWrapper() - .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 manageList = this.baseMapper.selectList(new LambdaQueryWrapper()