后续功能5

2f22b370 · jianan · 69c1ce41 · 2f22b370
Commit 2f22b370 authored Dec 08, 2021 by jianan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java
+2 -1

No files found.
--- a/yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java
@@ -82,10 +82,11 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
            if ("1".equals(item.getCommissionType())) {
                dropOption = systemConfigService.getDropOption("Base_Commission_Item", item.getCommissionItem());
                item.setCommissionTypeName("基础来佣");
-                item.setCommissionItemName(dropOption.getDropOptionName());
            } else {
                dropOption = systemConfigService.getDropOption("Special_Commission_Type", item.getCommissionItem());
                item.setCommissionTypeName("特殊激励来佣");
+            }
+            if (dropOption != null) {
                item.setCommissionItemName(dropOption.getDropOptionName());
            }
        }