bug修复

mitao

2024-05-23 5fcab4f1d5c3c65ecef6970a3479bae6d479ff99

 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());