From 4d9c7b8a6109c90f08c716fe3e19b6a990cc759a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?niohe=C2=B7erbao?= Date: Mon, 26 Jun 2023 09:47:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E4=B8=93=E5=AE=B6=E6=89=80=E5=A1=AB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B6=88=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/expert/assembler/ExpertAdminExpertManageAssembler.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertAdminExpertManageAssembler.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertAdminExpertManageAssembler.java index e531869..b7e6a73 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertAdminExpertManageAssembler.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertAdminExpertManageAssembler.java @@ -103,6 +103,9 @@ public class ExpertAdminExpertManageAssembler { } public List assembleDictionaryName(List collect) { + if (CollectionUtil.isEmpty(collect)){ + return new ArrayList<>(); + } return collect.stream().peek(r -> { DictionaryDTO dictionaryDTO = dictionaryCache.getByCode(r.getDictionaryCode()); if (Objects.nonNull(dictionaryDTO)) { @@ -113,6 +116,9 @@ public class ExpertAdminExpertManageAssembler { public List assembleTagName(List collect) { + if (CollectionUtil.isEmpty(collect)){ + return new ArrayList<>(); + } return collect.stream().peek(r -> { TagDTO tagDTO = tagCache.getByTagCode(r.getTagCode()); if (Objects.nonNull(tagDTO)) { From dcb1a766a3faf9e50203283023bf089677c7ffd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?niohe=C2=B7erbao?= Date: Mon, 26 Jun 2023 14:03:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E4=B8=93=E5=AE=B6=E5=BA=93=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=86=85=E5=A4=96=E5=9B=B4=E4=B8=93=E5=AE=B6=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expert/mapper/ExpertAdminManageMapper.java | 6 +++++ .../expert/mapper/ExpertAdminManageMapper.xml | 26 +++++++++++++++------- .../service/impl/ExpertAdminManageServiceImpl.java | 23 +++++++++++++++++-- 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/ExpertAdminManageMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/ExpertAdminManageMapper.java index a98abf7..a2dd01b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/ExpertAdminManageMapper.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/ExpertAdminManageMapper.java @@ -18,4 +18,10 @@ public interface ExpertAdminManageMapper { * @return */ List listExpertUserId(@Param("query") ListExpertQuery query); + + List listExpertDictionaryUserId(@Param("query") ListExpertQuery query); + + List listExpertTagUserId(@Param("query") ListExpertQuery query); + + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/ExpertAdminManageMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/ExpertAdminManageMapper.xml index 425f052..5e7aefa 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/ExpertAdminManageMapper.xml +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/ExpertAdminManageMapper.xml @@ -103,14 +103,24 @@ + + + + diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertAdminManageServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertAdminManageServiceImpl.java index cd10d39..842aa36 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertAdminManageServiceImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertAdminManageServiceImpl.java @@ -13,6 +13,8 @@ import com.ningdatech.pmapi.expert.entity.ExpertUserFullInfo; import com.ningdatech.pmapi.expert.mapper.ExpertAdminManageMapper; import com.ningdatech.pmapi.expert.model.cmd.ExpertAdminExpertManageQueryCmd; import com.ningdatech.pmapi.expert.model.dto.ExpertAdminExpertManageListDTO; +import com.ningdatech.pmapi.expert.model.query.ExpertDictionaryQuery; +import com.ningdatech.pmapi.expert.model.query.ExpertTagQuery; import com.ningdatech.pmapi.expert.model.query.ListExpertQuery; import com.ningdatech.pmapi.expert.service.ExpertAdminManageService; import com.ningdatech.pmapi.expert.service.IExpertUserFullInfoService; @@ -42,11 +44,28 @@ public class ExpertAdminManageServiceImpl implements ExpertAdminManageService { private final IExpertTagService iExpertTagService; private final ExpertAdminManageMapper expertAdminManageMapper; + private List listExpertUserId(ListExpertQuery listExpertQuery) { + List userIdList = expertAdminManageMapper.listExpertUserId(listExpertQuery); + + List expertTagQueryList = listExpertQuery.getExpertTagQueryList(); + if (CollectionUtils.isNotEmpty(expertTagQueryList)) { + List tagUserIdList = expertAdminManageMapper.listExpertTagUserId(listExpertQuery); + userIdList.retainAll(tagUserIdList); + } + + List expertDictionaryQueryList = listExpertQuery.getExpertDictionaryQueryList(); + if (CollectionUtils.isNotEmpty(expertDictionaryQueryList)) { + List dictionaryUserIdList = expertAdminManageMapper.listExpertDictionaryUserId(listExpertQuery); + userIdList.retainAll(dictionaryUserIdList); + } + return userIdList; + } + @Override public CommonPage getExpertLibraryList(ExpertAdminExpertManageQueryCmd req) { ListExpertQuery listExpertQuery = buildListExpertQuery(req); - List userIdList = expertAdminManageMapper.listExpertUserId(listExpertQuery); + List userIdList = listExpertUserId(listExpertQuery); List evidenceHasBeenSubmittedExpertInfoList = iExpertUserFullInfoService.list(Wrappers.lambdaQuery(ExpertUserFullInfo.class) .eq(ExpertUserFullInfo::getUserInfoStep, ExpertUserInfoStepEnum.EVIDENCE_HAS_BEEN_SUBMITTED.getKey())); @@ -113,6 +132,6 @@ public class ExpertAdminManageServiceImpl implements ExpertAdminManageService { @Override public List filterExpertUserIdList(ExpertAdminExpertManageQueryCmd queryCmd) { ListExpertQuery listExpertQuery = buildListExpertQuery(queryCmd); - return expertAdminManageMapper.listExpertUserId(listExpertQuery); + return listExpertUserId(listExpertQuery); } }