diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java index ebc8201..349b0c0 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java @@ -2,6 +2,7 @@ package com.chinaweal.aiccs.aiccs.abnormal.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chinaweal.aiccs.aiccs.abnormal.entity.*; import com.chinaweal.aiccs.aiccs.abnormal.mapper.TSBizRemListMapper; @@ -231,9 +232,10 @@ public class TSBizRemListServiceImpl extends ServiceImpl map = new HashMap<>(); - String areaNameq = Constant.NM_LOC_REGION_CODE.get(tsWritModel.getAreaCode()); - String nmSareaName = Constant.NM_REGION_CODE.get(tsWritModel.getAreaCode().substring(0, 4) + "00"); - String areaName = nmSareaName + areaNameq; + String cityName = Constant.NM_REGION_CODE.get(tsWritModel.getAreaCode().substring(0, 4) + "00"); + String locName = Constant.NM_LOC_REGION_CODE.get(tsWritModel.getAreaCode()); + String areaName = cityName + locName; + areaName = StringUtils.equals(tsWritModel.getAreaCode(),"150000") ? "内蒙古自治区" : areaName; map.put("areaName", areaName); map.put("writsNo", tsWritModel.getWritsno()); map.put("htmlContent", tsWritModel.getContent()); diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSBizSerIllegalRemServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSBizSerIllegalRemServiceImpl.java index 8e57bfb..038eae7 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSBizSerIllegalRemServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSBizSerIllegalRemServiceImpl.java @@ -240,9 +240,10 @@ public class TSBizSerIllegalRemServiceImpl extends BaseServiceImpl map = new HashMap<>(); - String areaNameq = Constant.NM_LOC_REGION_CODE.get(tsWritModel.getAreaCode()); - String nmSareaName = Constant.NM_REGION_CODE.get(tsWritModel.getAreaCode().substring(0, 4) + "00"); - String areaName = nmSareaName + areaNameq; + String cityName = Constant.NM_REGION_CODE.get(tsWritModel.getAreaCode().substring(0, 4) + "00"); + String locName = Constant.NM_LOC_REGION_CODE.get(tsWritModel.getAreaCode()); + String areaName = cityName + locName; + areaName = StringUtils.equals(tsWritModel.getAreaCode(),"150000") ? "内蒙古自治区" : areaName; map.put("areaName", areaName); map.put("writsNo", tsWritModel.getWritsno()); map.put("htmlContent", tsWritModel.getContent());