From 0ec408238775dacb01853ed4380a43e6578c0431 Mon Sep 17 00:00:00 2001 From: zhouxy Date: Wed, 7 Jan 2026 16:12:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E4=B8=A5=E4=BF=A1=E7=94=A8=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=85=81=E8=AE=B8=E4=B8=8A=E7=BA=A7=E5=8A=9E=E7=90=86?= =?UTF-8?q?=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 --- .../BizSerIllegalRemController.java | 69 +++++++++++++------ .../impl/TSBizSerIllegalServiceImpl.java | 3 +- 2 files changed, 49 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/BizSerIllegalRemController.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/BizSerIllegalRemController.java index d1a91be..68e3621 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/BizSerIllegalRemController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/BizSerIllegalRemController.java @@ -1057,21 +1057,45 @@ public class BizSerIllegalRemController extends BaseController implements Servle @RequestMapping(value = "/creditValidateBiz.do", method = RequestMethod.POST) public RestResult creditValidateBiz(HttpServletRequest request, String illegallistids) { AICUser aicUser = getLoginUser(request); - if (aicUser == null) return RestResult.error(ResultCode.USER_NOT_LOGGED_IN); - String userOrg = org.apache.commons.lang.StringUtils.substring(aicUser.getRegionID(), 0, 6); + if (aicUser == null) { + return RestResult.error(ResultCode.USER_NOT_LOGGED_IN); + } Map resultMap = new HashMap<>(); List> list = new ArrayList<>(); + //这一步进行判断，且允许上级办理下级的信用修复 + Map map = new HashMap<>(); + map.put("orgNumber", aicUser.getRegionID()); + map.put("deleted", "0"); + map.put("unittype", "1"); + OrgUnits org = aicorgService.queryByOrgNumberMap(map); + boolean isSame = true; - String[] illegallistidArr = illegallistids.split(Constant.SEMICOLON); - for (String illegallistid : illegallistidArr) { - TSSerIllegalList serIllegalListModel = tsSerIllegalListService.getById(illegallistid); - String unitCode = gzaiccodeService.changeUnitCn(serIllegalListModel.getDecorg(), serIllegalListModel.getDecorgCn()); - if(StringUtils.isNotBlank(unitCode) && !userOrg.equals(unitCode)){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(EBaseinfo::getPripid, serIllegalListModel.getPripid()); - EBaseinfo eBaseinfo = eBaseinfoService.getOne(wrapper); - if(!userOrg.equals(StringUtils.substring(eBaseinfo.getRegorg(),0,6))){ + if (org != null) { + String[] illegallistidArr = illegallistids.split(Constant.SEMICOLON); + for (String illegallistid : illegallistidArr) { + TSSerIllegalList serIllegalListModel = tsSerIllegalListService.getById(illegallistid); + Integer orgLevel = org.getOrgLevel(); + //根据机构等级判断 + if (orgLevel == 1) { //省局 + isSame = com.chinaweal.aiccs.common.util.StringUtils.equals( + StringUtils.substring(aicUser.getRegionID(), 0, 2), + StringUtils.substring(serIllegalListModel.getDecorg(), 0, 2)); + } else if (orgLevel == 2) { //市局 + isSame = com.chinaweal.aiccs.common.util.StringUtils.equals( + StringUtils.substring(aicUser.getRegionID(), 0, 4), + StringUtils.substring(serIllegalListModel.getDecorg(), 0, 4)); + } else if (orgLevel == 3) { //区局 + isSame = com.chinaweal.aiccs.common.util.StringUtils.equals( + StringUtils.substring(aicUser.getRegionID(), 0, 6), + StringUtils.substring(serIllegalListModel.getDecorg(), 0, 6)); + } else if (orgLevel >= 4) { //所 + isSame = com.chinaweal.aiccs.common.util.StringUtils.equals( + StringUtils.substring(aicUser.getRegionID(), 0, 6), + StringUtils.substring(serIllegalListModel.getDecorg(), 0, 6)); + } + + if(!isSame){ resultMap.put("regno", serIllegalListModel.getRegno()); resultMap.put("entname", serIllegalListModel.getEntname()); resultMap.put("pripid", serIllegalListModel.getPripid()); @@ -1080,10 +1104,9 @@ public class BizSerIllegalRemController extends BaseController implements Servle list.add(resultMap); return RestResult.ok(list); } - } - String validateResult = this.validate(illegallistid); - int days = (int) ((int)LocalDate.now().toEpochDay() - serIllegalListModel.getAbntime().toEpochDay()); + String validateResult = this.validate(illegallistid); + int days = (int) ((int)LocalDate.now().toEpochDay() - serIllegalListModel.getAbntime().toEpochDay()); // Period period = Period.between(serIllegalListModel.getAbntime(),LocalDate.now()); // if(!"该记录正在被移出".equals(validateResult)){ // if (days < 365){ @@ -1092,15 +1115,17 @@ public class BizSerIllegalRemController extends BaseController implements Servle // } // } - if (!"success".equals(validateResult)) { - - resultMap.put("regno", serIllegalListModel.getRegno()); - resultMap.put("entname", serIllegalListModel.getEntname()); - resultMap.put("pripid", serIllegalListModel.getPripid()); - resultMap.put("illegallistid", illegallistid); - resultMap.put("reason", validateResult); - list.add(resultMap); + if (!"success".equals(validateResult)) { + resultMap.put("regno", serIllegalListModel.getRegno()); + resultMap.put("entname", serIllegalListModel.getEntname()); + resultMap.put("pripid", serIllegalListModel.getPripid()); + resultMap.put("illegallistid", illegallistid); + resultMap.put("reason", validateResult); + list.add(resultMap); + } } + } else { + return RestResult.error(ResultCode.MYSTERIOUS_ERROR, "当前用户所属机关不存在"); } if (CollectionUtils.isNotEmpty(list)) return RestResult.ok(list); diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSBizSerIllegalServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSBizSerIllegalServiceImpl.java index 1928379..aa8523b 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSBizSerIllegalServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/TSBizSerIllegalServiceImpl.java @@ -641,7 +641,8 @@ public class TSBizSerIllegalServiceImpl extends BaseServiceImpl