From 01a70fcb6c2c8bbaf7277b8436a574231ca8d42c Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sat, 19 Aug 2023 10:42:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81=E9=80=82?=
 =?UTF-8?q?=E9=85=8Dspringboot3=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maxkey-web-app/src/app/service/base.service.ts         | 6 +++++-
 .../maxkey-web-mgt-app/src/app/service/base.service.ts     | 3 +++
 .../maxkey/web/contorller/OrganizationsController.java     | 7 ++++---
 .../web/permissions/contorller/ResourcesController.java    | 6 +++---
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/service/base.service.ts b/maxkey-web-frontend/maxkey-web-app/src/app/service/base.service.ts
index 5463d4152..5456ab0c1 100644
--- a/maxkey-web-frontend/maxkey-web-app/src/app/service/base.service.ts
+++ b/maxkey-web-frontend/maxkey-web-app/src/app/service/base.service.ts
@@ -82,7 +82,11 @@ export class BaseService<T> {
   }
 
   get(id: String): Observable<Message<T>> {
-    return this.http.get<Message<T>>(`${this.server.urls.base + this.server.urls.get}/${id}`);
+    if (id === null || id === '') {
+      return this.http.get<Message<T>>(`${this.server.urls.base + this.server.urls.get}`);
+    } else {
+      return this.http.get<Message<T>>(`${this.server.urls.base + this.server.urls.get}/${id}`);
+    }
   }
 
   getByParams(params: NzSafeAny, getURL?: string): Observable<Message<T>> {
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/base.service.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/base.service.ts
index 764217fcd..81ff7a0c1 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/base.service.ts
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/base.service.ts
@@ -84,6 +84,9 @@ export class BaseService<T> {
   }
 
   get(id: String): Observable<Message<T>> {
+    if (id === null || id === '') {
+      return this.http.get<Message<T>>(`${this.server.urls.base + this.server.urls.get}`);
+    }
     return this.http.get<Message<T>>(`${this.server.urls.base + this.server.urls.get}/${id}`);
   }
 
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java
index 496782f9d..27783989f 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java
+++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java
@@ -41,6 +41,7 @@ import org.dromara.maxkey.util.ExcelUtils;
 import org.dromara.maxkey.web.component.TreeAttributes;
 import org.dromara.maxkey.web.component.TreeNode;
 import org.dromara.mybatis.jpa.entity.JpaPageResults;
+import org.dromara.mybatis.jpa.query.Query;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -153,9 +154,9 @@ public class OrganizationsController {
 	@ResponseBody
 	@RequestMapping(value={"/tree"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> tree(@ModelAttribute Organizations organization,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-query  {}" , organization);
-		organization.setInstId(currentUser.getInstId());
-		List<Organizations>  orgList = organizationsService.query(organization);
+		_logger.debug("-tree  {}" , organization);
+		List<Organizations>  orgList = organizationsService.query(
+				Query.builder().eq("instid", currentUser.getInstId()));
 		if (orgList != null) {
 			TreeAttributes treeAttributes = new TreeAttributes();
 			int nodeCount = 0;
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java
index f4ab44f94..96f699b9e 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java
+++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java
@@ -31,6 +31,7 @@ import org.dromara.maxkey.persistence.service.ResourcesService;
 import org.dromara.maxkey.web.component.TreeAttributes;
 import org.dromara.maxkey.web.component.TreeNode;
 import org.dromara.mybatis.jpa.entity.JpaPageResults;
+import org.dromara.mybatis.jpa.query.Query;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -141,9 +142,8 @@ public class ResourcesController {
 	@ResponseBody
 	@RequestMapping(value={"/tree"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> tree(@ModelAttribute Resources resource,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-query  {}" , resource);
-		resource.setInstId(currentUser.getInstId());
-		List<Resources>  resourceList = resourcesService.query(resource);
+		_logger.debug("-tree  {}" , resource);
+		List<Resources>  resourceList = resourcesService.query(Query.builder().eq("instid", currentUser.getInstId()));
 		if (resourceList != null) {
 			TreeAttributes treeAttributes = new TreeAttributes();
 			int nodeCount = 0;
-- 
GitLab