From 21f45258cfcdc79127f85ad6e45736cff5acd345 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 21 Oct 2024 20:58:05 +0800
Subject: [PATCH] 1、数据割接程序，白云区矛盾纠纷多元化解平台 2、纠纷态势报错修改
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java | 18 +++++++++++-------
1 files changed, 11 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..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;
}
}
}
@@ -99,15 +98,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;
--
Gitblit v1.8.0