From 44b4501436cb507adbf1c67edeae181ea4446c3d Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 27 Aug 2025 15:52:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/assess/impl/AssessUserServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessUserServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessUserServiceImpl.java index 28cdbd40f..a10403f60 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessUserServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/AssessUserServiceImpl.java @@ -12,14 +12,12 @@ import com.njcn.advance.mapper.assess.AssessUserMapper; import com.njcn.advance.pojo.param.assess.AssessUserQuery; import com.njcn.advance.pojo.po.assess.AssessUser; import com.njcn.advance.service.assess.IAssessUserService; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.utils.HttpResultUtil; +import com.njcn.user.api.DeptFeignClient; import com.njcn.web.factory.PageFactory; +import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.util.Collections; -import java.util.List; /** *

@@ -30,12 +28,15 @@ import java.util.List; * @since 2025-06-06 */ @Service +@RequiredArgsConstructor public class AssessUserServiceImpl extends ServiceImpl implements IAssessUserService { + private final DeptFeignClient deptFeignClient; @Override public Page page(AssessUserQuery assessUserQuery) { Page pageParam = new Page<>(PageFactory.getPageNum(assessUserQuery), PageFactory.getPageSize(assessUserQuery)); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .in(AssessUser::getDeptId,deptFeignClient.getDepSonIdtByDeptId(assessUserQuery.getDeptId()).getData()) .eq(StrUtil.isNotBlank(assessUserQuery.getDeptName()), AssessUser::getDeptName, assessUserQuery.getDeptName()) .in(CollUtil.isNotEmpty(assessUserQuery.getBusScaleList()),AssessUser::getBusId,assessUserQuery.getBusScaleList()) .in(CollUtil.isNotEmpty(assessUserQuery.getPowerstationScaleList()),AssessUser::getPowerstationScale,assessUserQuery.getPowerstationScaleList())