From 3d2b51ea4520533de5e78f88dddf5b5c7dce4247 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 06 六月 2024 15:56:18 +0800
Subject: [PATCH] 管理后台添加营销员导入功能

---
 meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallCommissionSettlementServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallCommissionSettlementServiceImpl.java b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallCommissionSettlementServiceImpl.java
index 33fbe2d..8c17fe1 100644
--- a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallCommissionSettlementServiceImpl.java
+++ b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallCommissionSettlementServiceImpl.java
@@ -106,7 +106,7 @@
 
         // 获取销售人员关系
         MemUserRelation userRelation = memUserRelationService.getById(mallOrder.getSaleUserId());
-        if (userRelation == null && StrUtil.isBlank(userRelation.getRelationPath())) {
+        if (userRelation == null || StrUtil.isBlank(userRelation.getRelationPath())) {
             log.error("【核销订单-分佣】营销员团队关系{}错误!", userRelation);
             return ApiUtils.returnNG("营销员团队关系错误!");
         }

--
Gitblit v1.7.1