From 7fb54949ed72ce7a3af64e083d964ef96a9b1ff5 Mon Sep 17 00:00:00 2001 From: bynt <13586541001@163.com> Date: Wed, 19 Jun 2024 17:51:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/baiye/modules/distribute/mapper/PlushClueMapper.java | 2 +- .../modules/distribute/service/impl/TripartiteServiceImpl.java | 2 +- admin/src/main/java/com/baiye/modules/distribute/vo/ClueVO.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/PlushClueMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/PlushClueMapper.java index 0931479..edb4c6f 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/PlushClueMapper.java +++ b/admin/src/main/java/com/baiye/modules/distribute/mapper/PlushClueMapper.java @@ -23,7 +23,7 @@ public interface PlushClueMapper extends ExtendMapper { LambdaQueryWrapperX wrapper = WrappersX.lambdaQueryX(PushClueInfoEntity.class) .between(CharSequenceUtil.isNotBlank(qo.getStartTime()) && CharSequenceUtil.isNotBlank(qo.getEndTime()), PushClueInfoEntity::getCreateTime, qo.getStartTime(), qo.getEndTime()).eqIfPresent(PushClueInfoEntity::getClueId, qo.getClueId()).likeIfPresent - (PushClueInfoEntity::getRequestId, qo.getRequestId()).orderByDesc(PushClueInfoEntity::getId); + (PushClueInfoEntity::getRequestId, qo.getRequestId()).eqIfPresent(PushClueInfoEntity::getUserId, qo.getAssignedBy()).orderByDesc(PushClueInfoEntity::getId); this.selectPage(page, wrapper); IPage voPage = page.convert(PushClueConverter.INSTANCE::poToPageVo); diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/TripartiteServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/TripartiteServiceImpl.java index 1f8839a..14e58f5 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/TripartiteServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/TripartiteServiceImpl.java @@ -117,7 +117,7 @@ public class TripartiteServiceImpl implements TripartiteService { Long clueId = IdUtil.getSnowflake(workerId, datacenterId).nextId(); ClueDTO clueDTO = ClueDTO.builder().originName(ClueSourceEnum.STORE_DISTRIBUTION.getDescription()).clueId(clueId).remark (remark).nid(AESUtils.encrypt(phone, securityProperties.getPasswordSecretKey())).assignedBy - (reportUserId).createBy(distributeId).isNewClue(Boolean.TRUE).build(); + (reportUserId).createBy(distributeId).isNewClue(Boolean.TRUE).build(); list.add(clueDTO); clueService.saveClueListByStoreInfo(list); } diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/ClueVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/ClueVO.java index 59c366e..05c5191 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/ClueVO.java +++ b/admin/src/main/java/com/baiye/modules/distribute/vo/ClueVO.java @@ -28,7 +28,7 @@ public class ClueVO { @ExcelProperty(value = "手机号", converter = NidStringConverter.class, index = 0) private String nid; - + @ExcelIgnore @Schema(title = "线索来源") // @ExcelProperty(value = "线索来源名称", index = 1) private String originName;