From 08bae4808c1cc00ab4ef1bf5254b3d712228be4d Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sat, 12 Oct 2024 09:27:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java | 2 +-
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgVo.java | 2 ++
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridUserRoleDTO.java | 3 +++
3 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridUserRoleDTO.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridUserRoleDTO.java
index 5e6cec9..3e6bace 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridUserRoleDTO.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridUserRoleDTO.java
@@ -33,4 +33,7 @@
*/
private String roleName;
+
+ private boolean lastOrgRole;
+
}
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgVo.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgVo.java
index 4c48333..eac0a54 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgVo.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgVo.java
@@ -13,6 +13,8 @@
* name
*/
private String name;
+ private String systemCode;
+
private long current;
private long size;
private boolean needCount;
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
index a53dc14..76b521b 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
@@ -119,7 +119,7 @@
requestVo.setBodyVo(gridRoleMenuVo);
try {
// log.info("xsdobject:{}",JSON.toJSONString(requestVo));
- log.info("xsdurl:{}",gridUrl + "/sys/getOrgRole");
+ log.info("xsdurl:{}",gridUrl + "/sys/getUserMenuRecur");
// log.info("xsdurl:{}",testUrl + "/sys/getUserByToken");
s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getUserMenuRecur", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
log.info("xsd:{}",s);
--
Gitblit v1.8.0