nm-project
/
aiccs-api
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs-api

This commit is contained in:
黎润豪 2026-02-04 15:08:54 +08:00
parent 2520babdb2 5caa8f04d9
commit 168f2211b5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java
View File

@ -498,13 +498,13 @@ public class EBaseinfo extends Model<EBaseinfo> {
private String sareanameJxmx; private String sareanameJxmx;
/** /**
* 受理机关 * 登记机关转换后的机构代码
*/ */
@TableField("ACCEPTREGORG") @TableField("ACCEPTREGORG")
private String acceptRegorg; private String acceptRegorg;
/** /**
* 受理机关中文 * 登记机关转换后的机构中文
*/ */
@TableField("ACCEPTREGORG_CN") @TableField("ACCEPTREGORG_CN")
private String acceptregorgCn; private String acceptregorgCn;

4
src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java
View File

@ -1678,8 +1678,8 @@ public class EBaseinfoServiceImpl extends BaseServiceImpl<EBaseinfoMapper, EBase
.set(EBaseinfo::getSuporg, afterDeptid) .set(EBaseinfo::getSuporg, afterDeptid)
.set(EBaseinfo::getSuporgCn, org.getOrgUnitName()) .set(EBaseinfo::getSuporgCn, org.getOrgUnitName())
.set(EBaseinfo::getLocaladm, afterDeptid) .set(EBaseinfo::getLocaladm, afterDeptid)
.set(EBaseinfo::getAcceptRegorg, afterDeptid) // .set(EBaseinfo::getAcceptRegorg, afterDeptid)
.set(EBaseinfo::getAcceptregorgCn, org.getOrgUnitName()) // .set(EBaseinfo::getAcceptregorgCn, org.getOrgUnitName())
.set(EBaseinfo::getRegulatory, afterDeptid) .set(EBaseinfo::getRegulatory, afterDeptid)
.set(EBaseinfo::getRegulatoryName, org.getOrgUnitName()) .set(EBaseinfo::getRegulatoryName, org.getOrgUnitName())
.eq(EBaseinfo::getPripid, eBaseinfo.getPripid()); // 根据主键更新 .eq(EBaseinfo::getPripid, eBaseinfo.getPripid()); // 根据主键更新

6
src/main/java/com/chinaweal/aiccs/org/controller/UserController.java
View File

@ -697,8 +697,8 @@ public class UserController extends BaseController {
List<TSBizSpeList> bizSpeLists = bizSpeListService.list(wrapper); List<TSBizSpeList> bizSpeLists = bizSpeListService.list(wrapper);
TSBizSpeList speList = bizSpeLists.get(0); TSBizSpeList speList = bizSpeLists.get(0);
EBaseinfo baseinfo = baseinfoService.getOneByPripid(speList.getPripid()); EBaseinfo baseinfo = baseinfoService.getOneByPripid(speList.getPripid());
if (!orgUnits.getOrgNumber().equals(baseinfo.getRegorg())) { if (!orgUnits.getOrgNumber().equals(baseinfo.getAcceptRegorg())) {
OrgUnits orginfo = aicorgService.queryByOrgNumber(baseinfo.getRegorg()); OrgUnits orginfo = aicorgService.queryByOrgNumber(baseinfo.getAcceptRegorg());
List<AICUser> list = orgUM.findUsersByOrgAndPermission(orginfo.getOrgUnitId(), permission); List<AICUser> list = orgUM.findUsersByOrgAndPermission(orginfo.getOrgUnitId(), permission);
if (list != null) { if (list != null) {
list.forEach(each -> each.setPassword(null)); list.forEach(each -> each.setPassword(null));
@ -726,7 +726,7 @@ public class UserController extends BaseController {
List<AICUser> list2 = new ArrayList<>(); List<AICUser> list2 = new ArrayList<>();
// 获取不到列入机关行政区划，查登记机关 // 获取不到列入机关行政区划，查登记机关
EBaseinfo eBaseinfo = baseinfoService.getById(tsAbnList.getPripid()); EBaseinfo eBaseinfo = baseinfoService.getById(tsAbnList.getPripid());
list2 = aicorgService.queryByOrgNumberAndSysMenu(permission, eBaseinfo.getRegorg()); list2 = aicorgService.queryByOrgNumberAndSysMenu(permission, eBaseinfo.getAcceptRegorg());
list.addAll(list2); list.addAll(list2);
// 还可以选择同监管所且配置了经办权限的人员 // 还可以选择同监管所且配置了经办权限的人员
AICUser aicUser = SSOUtil.getUser(); AICUser aicUser = SSOUtil.getUser();