From 5bc349b0321d6058ea859780de6d1bd5a0ffdb35 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 21 七月 2026 14:09:43 +0800
Subject: [PATCH] Merge branch '2.2' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 2.2
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
index 2e46482..3f1b944 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
@@ -270,25 +270,28 @@
}
Integer resolveDefaultRoleId(Integer partnerType) {
- String roleName = partnerTypeRoleName(partnerType);
- Integer roleId = this.baseMapper.getDefaultPartnerRoleId(roleName);
- if (roleId == null && !Integer.valueOf(1).equals(partnerType)) {
- roleId = this.baseMapper.getDefaultPartnerRoleId("合作商");
+ List<String> roleNames = partnerTypeRoleNames(partnerType);
+ Integer roleId = null;
+ for (String roleName : roleNames) {
+ roleId = this.baseMapper.getDefaultPartnerRoleId(roleName);
+ if (roleId != null) {
+ break;
+ }
}
if (roleId == null) {
- throw new RuntimeException("系统内置角色【" + roleName + "】不存在，请先配置角色");
+ throw new RuntimeException("系统内置角色【" + roleNames.get(0) + "】不存在，请先配置角色");
}
return roleId;
}
- private String partnerTypeRoleName(Integer partnerType) {
+ private List<String> partnerTypeRoleNames(Integer partnerType) {
if (Integer.valueOf(2).equals(partnerType)) {
- return "场地方";
+ return Arrays.asList("场地方", "合作商");
}
if (Integer.valueOf(3).equals(partnerType)) {
- return "服务商";
+ return Arrays.asList("服务商", "合作商");
}
- return "合作商";
+ return Arrays.asList("独立合作商", "合作商");
}
/**
* 删除合作商
--
Gitblit v1.7.1