diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/BizRemListController.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/BizRemListController.java index 6101bdc..677bd4a 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/BizRemListController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/BizRemListController.java @@ -275,23 +275,25 @@ public class BizRemListController extends BaseController implements ServletConte wrapper.eq(EBaseinfo::getPripid, tsAbnList.getPripid()); EBaseinfo eBaseinfo = eBaseinfoService.getOne(wrapper); Integer orgLevel = org.getOrgLevel(); + //主体的判断机关,如果没有属地就取登记机关 + String entOrg = StringUtils.isNotEmpty(eBaseinfo.getSuporg()) ? eBaseinfo.getSuporg() : eBaseinfo.getRegorg(); //根据机构等级判断 if (orgLevel == 1) { //省局 isSame = com.chinaweal.aiccs.common.util.StringUtils.equals( StringUtils.substring(aicUser.getRegionID(), 0, 2), - StringUtils.substring(eBaseinfo.getRegorg(), 0, 2)); + StringUtils.substring(entOrg, 0, 2)); } else if (orgLevel == 2) { //市局 isSame = com.chinaweal.aiccs.common.util.StringUtils.equals( StringUtils.substring(aicUser.getRegionID(), 0, 4), - StringUtils.substring(eBaseinfo.getRegorg(), 0, 4)); + StringUtils.substring(entOrg, 0, 4)); } else if (orgLevel == 3) { //区局 isSame = com.chinaweal.aiccs.common.util.StringUtils.equals( StringUtils.substring(aicUser.getRegionID(), 0, 6), - StringUtils.substring(eBaseinfo.getRegorg(), 0, 6)); + StringUtils.substring(entOrg, 0, 6)); } else if (orgLevel >= 4) { //所 isSame = com.chinaweal.aiccs.common.util.StringUtils.equals( StringUtils.substring(aicUser.getRegionID(), 0, 6), - StringUtils.substring(eBaseinfo.getRegorg(), 0, 6)); + StringUtils.substring(entOrg, 0, 6)); } } else { return RestResult.error(ResultCode.MYSTERIOUS_ERROR, "当前用户所属机关不存在"); @@ -315,7 +317,7 @@ public class BizRemListController extends BaseController implements ServletConte resultMap.put("entname", tsAbnList.getEntname()); resultMap.put("pripid", tsAbnList.getPripid()); resultMap.put("abnlistid", abnlistid); - resultMap.put("reason", "列入机关与当前用户所属机关不匹配!"); + resultMap.put("reason", "属地机关与当前用户所属机关不匹配!"); list.add(resultMap); return RestResult.ok(list); }