diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java index 7614690..db88ca1 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java @@ -498,13 +498,13 @@ public class EBaseinfo extends Model { private String sareanameJxmx; /** - * 受理机关 + * 登记机关转换后的机构代码 */ @TableField("ACCEPTREGORG") private String acceptRegorg; /** - * 受理机关中文 + * 登记机关转换后的机构中文 */ @TableField("ACCEPTREGORG_CN") private String acceptregorgCn; diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java index c487b17..299060e 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java @@ -1678,8 +1678,8 @@ public class EBaseinfoServiceImpl extends BaseServiceImpl bizSpeLists = bizSpeListService.list(wrapper); TSBizSpeList speList = bizSpeLists.get(0); EBaseinfo baseinfo = baseinfoService.getOneByPripid(speList.getPripid()); - if (!orgUnits.getOrgNumber().equals(baseinfo.getRegorg())) { - OrgUnits orginfo = aicorgService.queryByOrgNumber(baseinfo.getRegorg()); + if (!orgUnits.getOrgNumber().equals(baseinfo.getAcceptRegorg())) { + OrgUnits orginfo = aicorgService.queryByOrgNumber(baseinfo.getAcceptRegorg()); List list = orgUM.findUsersByOrgAndPermission(orginfo.getOrgUnitId(), permission); if (list != null) { list.forEach(each -> each.setPassword(null)); @@ -726,7 +726,7 @@ public class UserController extends BaseController { List list2 = new ArrayList<>(); // 获取不到列入机关行政区划,查登记机关 EBaseinfo eBaseinfo = baseinfoService.getById(tsAbnList.getPripid()); - list2 = aicorgService.queryByOrgNumberAndSysMenu(permission, eBaseinfo.getRegorg()); + list2 = aicorgService.queryByOrgNumberAndSysMenu(permission, eBaseinfo.getAcceptRegorg()); list.addAll(list2); // 还可以选择同监管所且配置了经办权限的人员 AICUser aicUser = SSOUtil.getUser();