From bc1377c8880a2075c258cca5adfc77ef9088c4d9 Mon Sep 17 00:00:00 2001 From: zhouxy Date: Tue, 6 Jan 2026 20:23:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E5=BC=82=E5=85=81=E8=AE=B8=E4=B8=8A?= =?UTF-8?q?=E7=BA=A7=E5=8F=91=E8=B5=B7=E4=B8=8B=E7=BA=A7=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BizSpeListController.java | 18 +++++++-------- .../controller/EBaseinfoController.java | 2 +- .../aiccs/org/service/AicorgService.java | 2 ++ .../org/service/impl/AicorgServiceImpl.java | 22 +++++++++++++++++++ 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/BizSpeListController.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/BizSpeListController.java index 654197b..3ffc319 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/BizSpeListController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/BizSpeListController.java @@ -410,10 +410,10 @@ public class BizSpeListController extends BaseController { String bizSeq = UUID.randomUUID().toString(); EBaseinfo eBaseinfo = eBaseinfoService.getById(pripid); - //该主体登记机关是其他机关登记 - if (!code.equals(eBaseinfo.getRegorg().substring(0, 6))) { - return RestResult.error(ResultCode.BUSINESS_LOGIC_ERROR, "该主体登记机关是其他机关登记，请重新选择！"); - } +// //该主体登记机关是其他机关登记 +// if (!code.equals(eBaseinfo.getRegorg().substring(0, 6))) { +// return RestResult.error(ResultCode.BUSINESS_LOGIC_ERROR, "该主体登记机关是其他机关登记，请重新选择！"); +// } String entertype = ""; String enttype = eBaseinfo.getEnttype(); @@ -1609,7 +1609,7 @@ public class BizSpeListController extends BaseController { if (StringUtils.isBlank(cacheData)) { throw new BusinessException("缓存数据已过期，请重新上传文件"); } - HashSet enableList = JSONObject.parseObject(cacheData, + HashSet enableList = JSONObject.parseObject(cacheData, new com.alibaba.fastjson.TypeReference>() {}); List bizSpeList = new ArrayList<>(); TSTaskList taskListModel = new TSTaskList(); @@ -1695,7 +1695,7 @@ public class BizSpeListController extends BaseController { if (StringUtils.isBlank(cacheData)) { throw new BusinessException("缓存数据已过期，请重新上传文件"); } - HashSet enableList = JSONObject.parseObject(cacheData, + HashSet enableList = JSONObject.parseObject(cacheData, new com.alibaba.fastjson.TypeReference>() {}); List bizSpeList = new ArrayList<>(); TSTaskList taskListModel = new TSTaskList(); @@ -1971,7 +1971,7 @@ public class BizSpeListController extends BaseController { String disableListId = UUID.randomUUID().toString(); resultMap.put("enableListId", enableListId); resultMap.put("disableListId", disableListId); - + String enableCacheKey = CACHE_KEY_PREFIX + enableListId; String disableCacheKey = CACHE_KEY_PREFIX + disableListId; redisService.set(enableCacheKey, JSONObject.toJSONString(enableList), CACHE_EXPIRE_SECONDS); @@ -2155,7 +2155,7 @@ public class BizSpeListController extends BaseController { String disableListId = UUID.randomUUID().toString(); resultMap.put("enableListId", enableListId); resultMap.put("disableListId", disableListId); - + String enableCacheKey = CACHE_KEY_PREFIX + enableListId; String disableCacheKey = CACHE_KEY_PREFIX + disableListId; redisService.set(enableCacheKey, JSONObject.toJSONString(enableList), CACHE_EXPIRE_SECONDS); @@ -2202,7 +2202,7 @@ public class BizSpeListController extends BaseController { if (StringUtils.isBlank(cacheData)) { throw new BusinessException("缓存数据已过期，请重新上传文件"); } - List list = JSONObject.parseObject(cacheData, + List list = JSONObject.parseObject(cacheData, new com.alibaba.fastjson.TypeReference>() {}); String fileName = "地址批量列异错误清单.xlsx"; tsAttachmentService.exportExcel(request, response, fileName, list); diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java index e5fa053..277b8f7 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java @@ -226,7 +226,7 @@ public class EBaseinfoController extends BaseController { IPage page = null; String searchtype = StringUtils.tranObject(customParamMap.get("searchtype")); if ("2".equals(searchtype)) { // 个案 - String suporg = aicorgService.getRegionCodeByUser(curUser); + String suporg = aicorgService.getRegionCodeByOrgLevel(curUser); customParamMap.put("suporg", suporg); page = toincludeabnMapper.listByEb(new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()), customParamMap); } else { diff --git a/src/main/java/com/chinaweal/aiccs/org/service/AicorgService.java b/src/main/java/com/chinaweal/aiccs/org/service/AicorgService.java index d9573b7..ba0bc75 100644 --- a/src/main/java/com/chinaweal/aiccs/org/service/AicorgService.java +++ b/src/main/java/com/chinaweal/aiccs/org/service/AicorgService.java @@ -76,4 +76,6 @@ public interface AicorgService extends IService { OrgUnits queryByOrgNumberMap(Map params); + String getRegionCodeByOrgLevel(AICUser curUser); + } diff --git a/src/main/java/com/chinaweal/aiccs/org/service/impl/AicorgServiceImpl.java b/src/main/java/com/chinaweal/aiccs/org/service/impl/AicorgServiceImpl.java index 1a58f08..7084d68 100644 --- a/src/main/java/com/chinaweal/aiccs/org/service/impl/AicorgServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/org/service/impl/AicorgServiceImpl.java @@ -256,4 +256,26 @@ public class AicorgServiceImpl extends ServiceImpl imple public OrgUnits queryByOrgNumberMap(Map params) { return aicorgMapper.queryByOrgNumberMap(params); } + + @Override + public String getRegionCodeByOrgLevel(com.chinaweal.aicorg.model.AICUser curUser) { + Map map = new HashMap<>(); + map.put("orgNumber", curUser.getRegionID()); + map.put("deleted", "0"); + map.put("unittype", "1"); + OrgUnits org = this.queryByOrgNumberMap(map); + Integer orgLevel = org.getOrgLevel(); + String suporg = ""; + //根据机构等级判断 + if (orgLevel == 1) { //省局 + suporg = StringUtils.substring(org.getOrgNumber(), 0, 2); + } else if (orgLevel == 2) { //市局 + suporg = StringUtils.substring(org.getOrgNumber(), 0, 4); + } else if (orgLevel == 3) { //区局 + suporg = StringUtils.substring(org.getOrgNumber(), 0, 6); + } else if (orgLevel >= 4) { //所 + suporg = StringUtils.substring(org.getOrgNumber(), 0, 6); + } + return suporg; + } }