From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
index 32b9a1a..5676646 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
@@ -204,12 +204,12 @@
Map<Integer, Integer> areaMap1 = new HashMap<>();
Map<Integer, ResponsibilityUnitQuery> areaMap = new HashMap<>();
for (ResponsibilityUnitQuery responsibilityUnitQuery : sysAreas) {
- if (responsibilityUnitQuery.getUnitName().equals("������������")){
+ if (responsibilityUnitQuery.getUnitId().equals(38)){
areaMap1.put(responsibilityUnitQuery.getAreaCode(), responsibilityUnitQuery.getUnitId());
responsibilityUnitQuery.setUnitId(responsibilityUnitQuery.getAreaCode());
responsibilityUnitQuery.setUnitName("������������������������");
}
- if (responsibilityUnitQuery.getUnitName().equals("������������������")){
+ if (responsibilityUnitQuery.getUnitId().equals(1)){
areaMap1.put(responsibilityUnitQuery.getAreaCode(),responsibilityUnitQuery.getUnitId());
responsibilityUnitQuery.setUnitId(responsibilityUnitQuery.getAreaCode());
responsibilityUnitQuery.setUnitName("������������������������");
@@ -224,14 +224,19 @@
ResponsibilityUnitQuery parentArea = areaMap.get(parentCode);
if (responsibilityUnitQuery.getAreaCode().equals(210381)|| responsibilityUnitQuery.getAreaCode().equals(320900)){
+
+ QueryWrapper<ResponsibilityUnit> wr = new QueryWrapper<>();
+ wr.eq("area_code",responsibilityUnitQuery.getAreaCode());
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectOne(wr);
+
Integer integer = areaMap1.get(responsibilityUnitQuery.getAreaCode());
ResponsibilityUnitQuery rsUnitQuery = new ResponsibilityUnitQuery();
rsUnitQuery.setUnitId(integer);
rsUnitQuery.setParentCode(responsibilityUnitQuery.getParentCode());
if (responsibilityUnitQuery.getAreaCode().equals(210381)){
- rsUnitQuery.setUnitName("������������������");
+ rsUnitQuery.setUnitName(responsibilityUnit.getUnitName());
}else {
- rsUnitQuery.setUnitName("������������");
+ rsUnitQuery.setUnitName(responsibilityUnit.getUnitName());
}
rsUnitQuery.setAreaCode(responsibilityUnitQuery.getAreaCode());
rsUnitQuery.setChildren(new ArrayList<>());
--
Gitblit v1.8.0