From 42096275a6826f314acc0bd621965eb5875af746 Mon Sep 17 00:00:00 2001 From: bynt <13586541001@163.com> Date: Mon, 25 Sep 2023 14:32:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribute/controller/CustomController.java | 13 +++++++++---- .../modules/distribute/mapper/CustomMapper.java | 5 +++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/CustomController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/CustomController.java index a192895..d0eb424 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/CustomController.java +++ b/admin/src/main/java/com/baiye/modules/distribute/controller/CustomController.java @@ -42,10 +42,15 @@ public class CustomController { (SecurityUtils.getCurrentUserId()))) { qo.setCompanyId(SecurityUtils.getWhichUserId()); } - if (ObjectUtil.isNotNull(qo.getSalesmanType()) && qo.getSalesmanType() == 1) { - // 查询当前用户自己的 - qo.setSalesmanType(null); - qo.setCreateBy(SecurityUtils.getCurrentUserId()); + if (ObjectUtil.isNotNull(qo.getSalesmanType())) { + if (qo.getSalesmanType() == 1) { + // 查询当前用户自己的 + qo.setSalesmanType(null); + qo.setCreateBy(SecurityUtils.getCurrentUserId()); + } + if (qo.getSalesmanType() > 1) { + qo.setEnrollStatus(0); + } } return R.ok(customService.queryPage(pageParam, qo)); } diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java index 2452474..ce95d53 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java +++ b/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java @@ -22,8 +22,9 @@ public interface CustomMapper extends ExtendMapper { wrapperX.eqIfPresent(CustomEntity::getCreateBy, qo.getCreateBy()) .likeIfPresent(CustomEntity::getCustomName, qo.getCustomName()) .likeIfPresent(CustomEntity::getBatchNo, qo.getBatchNo()) - .eqIfPresent(CustomEntity::getCompanyId,qo.getCompanyId()) - .eqIfPresent(CustomEntity::getType,qo.getSalesmanType()) + .gtIfPresent(CustomEntity::getEnrollStatus, qo.getEnrollStatus()) + .eqIfPresent(CustomEntity::getCompanyId, qo.getCompanyId()) + .eqIfPresent(CustomEntity::getType, qo.getSalesmanType()) .eqIfPresent(CustomEntity::getCustomNid, qo.getCustomNid()) .eqIfPresent(CustomEntity::getEnrollStatus, qo.getEnrollStatus()); if (StringUtils.isNotBlank(qo.getDistributeStartTime()) && StringUtils.isNotBlank(qo.getDistributeEndTime())) {