优化查询条件

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) {
+		if (ObjectUtil.isNotNull(qo.getSalesmanType())) {
-			// 查询当前用户自己的
+			if (qo.getSalesmanType() == 1) {
-			qo.setSalesmanType(null);
+				// 查询当前用户自己的
-			qo.setCreateBy(SecurityUtils.getCurrentUserId());
+				qo.setSalesmanType(null);
+				qo.setCreateBy(SecurityUtils.getCurrentUserId());
+			}
+			if (qo.getSalesmanType() > 1) {
+				qo.setEnrollStatus(0);
+			}
 		}
 		return R.ok(customService.queryPage(pageParam, qo));
 	}

admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java

@@ -22,8 +22,9 @@ public interface CustomMapper extends ExtendMapper<CustomEntity> {
 		wrapperX.eqIfPresent(CustomEntity::getCreateBy, qo.getCreateBy())
 				.likeIfPresent(CustomEntity::getCustomName, qo.getCustomName())
 				.likeIfPresent(CustomEntity::getBatchNo, qo.getBatchNo())
-				.eqIfPresent(CustomEntity::getCompanyId,qo.getCompanyId())
+				.gtIfPresent(CustomEntity::getEnrollStatus, qo.getEnrollStatus())
-				.eqIfPresent(CustomEntity::getType,qo.getSalesmanType())
+				.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())) {