From 6ccbfd6a5192d432facf94b6fd91ae3dd26683e4 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Tue, 15 Oct 2024 15:20:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java | 9 +++++++--
dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java | 15 ++++++++++-----
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java
index 071acd9..37fdadd 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java
@@ -99,15 +99,20 @@
public CtUserole getRoleMenu(GridRoleMenuVo gridRoleMenuVo) {
//需要等所有菜单权限确认后再编写后续逻辑
CtUserole ctUserole = new CtUserole();
- ctUserole.setRoleId("22_00024-4");
- ctUserole.setRoleName("纠纷化解人员");
+
R<List<GridRoleMenuDTO>> roleMenu = sysClient.getRoleMenu(gridRoleMenuVo);
if (roleMenu.getCode() == R.SUCCESS) {
List<GridRoleMenuDTO> data = roleMenu.getData();
- String name = data.get(0).getName();
- if("矛盾纠纷化解子系统".equals(name)){
- List<GridRoleMenuDTO> children = data.get(0).getChildren();
+ if (data.size() > 0) {
+ String name = data.get(0).getName();
+ if ("矛盾纠纷化解子系统".equals(name)) {
+ List<GridRoleMenuDTO> children = data.get(0).getChildren();
+ }else {
+
+ }
+ ctUserole.setRoleId("22_00024-4");
+ ctUserole.setRoleName("纠纷化解人员");
}
}
return ctUserole;
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
index 60d42ad..87f5af2 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
@@ -452,9 +452,14 @@
gridRoleMenuVo.setOrgRoleId(userRoleDTO.getRoleId());
gridRoleMenuVo.setMenuSys("sub-mdjfhj");
CtUserole roleMenu = sysClient.getRoleMenu(gridRoleMenuVo);
+ if (roleMenu == null || StringUtils.isEmpty(roleMenu.getRoleId())) {
+ return ReturnFailUtils.getRepInfo("该用户没有矛调系统的权限");
+ }
List<CtUserole> ctUseroles = new ArrayList<>();
ctUseroles.add(roleMenu);
+ log.info("xsd:roleMenu:{}", roleMenu);
CtUnit ctUnit = ctUnitService.selectUnitByGridId(userRoleDTO.getOrgId());
+ log.info("xsd:newuser:{}", ctUnit);
if (ctUnit != null && StringUtils.isNotEmpty(ctUnit.getId())) {
CtUserSaveDTO ctUserSaveDTO = new CtUserSaveDTO();
ctUserSaveDTO.setUnitId(ctUnit.getId());
@@ -466,9 +471,9 @@
ctUserSaveDTO.setIdcard(gridUserBaseDTO.getIdNumber());
ctUserSaveDTO.setCtUseroleList(ctUseroles);
ctUserService.webSaveCtUser(ctUserSaveDTO, "-1");
-
+ log.info("xsd:ctUserSaveDTO:{}", ctUserSaveDTO);
} else {
- return ReturnFailUtils.getRepInfo("用户不存在！，请确认后重试！");
+ return ReturnFailUtils.getRepInfo("该用户所属机构不允许登录矛调系统！请调整机构后重试！");
}
return ReturnSucUtils.getRepInfo("创建账号成功");
}
--
Gitblit v1.8.0