From 5fcab4f1d5c3c65ecef6970a3479bae6d479ff99 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 23 五月 2024 18:43:19 +0800
Subject: [PATCH] bug修复
---
meiya-admin/src/main/java/com/sinata/modular/member/controller/MemUserSalesController.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/meiya-admin/src/main/java/com/sinata/modular/member/controller/MemUserSalesController.java b/meiya-admin/src/main/java/com/sinata/modular/member/controller/MemUserSalesController.java
index e1419dc..1472182 100644
--- a/meiya-admin/src/main/java/com/sinata/modular/member/controller/MemUserSalesController.java
+++ b/meiya-admin/src/main/java/com/sinata/modular/member/controller/MemUserSalesController.java
@@ -194,7 +194,7 @@
// 封装数据
for (Map<String, Object> map : list) {
map.put("cityCode",
- cityRegionService.getProvinceCityCountyNameByAll(cityAll, Convert.toStr(map.get("city_code"))).stream()
+ cityRegionService.getProvinceCityCountyNameByAll(cityAll, Convert.toStr(map.get("agent_county_code"))).stream()
.map(TCityRegion::getName)
.collect(Collectors.joining("-"))
);
@@ -237,20 +237,13 @@
// 用户等级
Integer userMemberGradeId = map.get("member_grade_id") == null ? null : (Integer) map.get("member_grade_id");
// 查询上级城市合伙人、市场总监信息
- MemUser[] parentV4V5User = memUserRelationService.getParentV4V5ByRelationPath(
- v4UserList,
- v5UserList,
+ MemUser[] parentV4V5User = memUserRelationService.getParentV4V5ByRelationPath2(
map.get("relation_path") == null ? null : map.get("relation_path").toString(),
userMemberGradeId
);
- if (parentV4V5User[0] != null) {
+ if (parentV4V5User[0] != null) {
map.put("v4ShowId", parentV4V5User[0].getShowId());
map.put("v4Team", parentV4V5User[0].getRealName());
- } else if (parentV4V5User[1] != null) {
- map.put("v4ShowId", parentV4V5User[1].getShowId());
- map.put("v4Team", parentV4V5User[1].getRealName());
- map.put("v5ShowId", parentV4V5User[1].getShowId());
- map.put("v5Team", parentV4V5User[1].getRealName());
}
if (parentV4V5User[1] != null) {
map.put("v5ShowId", parentV4V5User[1].getShowId());
--
Gitblit v1.7.1