From f6a7fafd16a3b088adc9017cfdfedf065ec8a3d6 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Tue, 22 Oct 2024 10:31:13 +0800
Subject: [PATCH] fix:解纷态势-区选择还出现区问题修复
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
index 023b39d..6ce9368 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -1008,35 +1008,32 @@
CtUnitDTO ctUnitDTO = custClient.getUnitByUserId(userId);
String areaCode = null;
//目前没有村居数据，所以单位等级是4的也归集到3里面
- List<Integer> unitGrades = new ArrayList<>();
-
if(ctUnitDTO.getUnitGrade().equals(1)){
terms.put("queCity", ctUnitDTO.getCity());
- areaCode = ctUnitDTO.getCity();
- unitGrades.add(ctUnitDTO.getUnitGrade());
}else if(ctUnitDTO.getUnitGrade().equals(2)){
terms.put("queArea", ctUnitDTO.getArea());
- areaCode = ctUnitDTO.getArea();
- unitGrades.add(ctUnitDTO.getUnitGrade());
}else if(ctUnitDTO.getUnitGrade().equals(3) || ctUnitDTO.getUnitGrade().equals(4)){
terms.put("queRoad", ctUnitDTO.getRoad());
- areaCode = ctUnitDTO.getRoad();
- unitGrades.add(3);
- unitGrades.add(4);
}
//目前没有村居，所以区和街道进来都是按街道展示
String areaType = null;//兼容白云数据
+ List<Integer> unitGrades = new ArrayList<>();
if(ObjectUtils.isNotEmpty(terms.get("queRoad"))){
terms.put("areaType","2");
areaType = "2";
areaCode = terms.get("queRoad")+"";
+ unitGrades.add(3);
+ unitGrades.add(4);
}else if(ObjectUtils.isNotEmpty(terms.get("queArea"))){
terms.put("areaType","2");
areaType = "2";
areaCode = terms.get("queArea")+"";
+ unitGrades.add(2);
}else{
areaType = "1";
+ unitGrades.add(1);
+ areaCode = ctUnitDTO.getCity();
}
//基础数据统计
CaseStatisticsBaseDTO caseStatisticsBaseDTO = mapper.statisticsBase(terms);
--
Gitblit v1.8.0