From c1a463b9f1c0a7160dbd0ac1c7490eef13861a5e Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Tue, 29 Oct 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java | 19 ++++++++++++-------
1 files changed, 12 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 b0a3f63..3d7a40f 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
@@ -83,9 +83,8 @@
if (userRoleList.getCode() == R.SUCCESS) {
List<GridUserRoleDTO> data = userRoleList.getData();
for (GridUserRoleDTO item : data) {
- if (item.isLastOrgRole()) {
+ if (item.getRoleName().contains("矛调系统")) {
BeanUtils.copyProperties(item, roleDTO);
- break;
}
}
}
@@ -97,16 +96,22 @@
* @return true管理员，全部权限;false,纠纷调解员，部分权限 //如果全部菜单权限，分配管理员角色;如果部分菜单权限，分配纠纷化解员角色
*/
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;
--
Gitblit v1.8.0