swb
2024-10-21 0aea8bd18daaaf91e622fdcfdd81dbb2e1b4860c
fix:立行立改责任主体修改提交
2 files modified
25 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java 12 ●●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java 13 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
@@ -88,12 +88,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("辽宁省——海城市");
@@ -108,14 +108,18 @@
            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<>());
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<>());