From 1ee5043af9ee5e53acb52a70fd93c4656e8bbb44 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 九月 2023 11:59:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java b/server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java
index a81ad34..8886dac 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemRoleController.java
@@ -5,8 +5,10 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.CreateRoleMenuDTO;
import com.doumee.dao.system.dto.CreateRolePermissionDTO;
import com.doumee.dao.system.dto.QuerySystemRoleDTO;
@@ -104,7 +106,9 @@
@GetMapping("/all")
@RequiresPermissions("system:role:query")
public ApiResponse<List<SystemRole>> findAll () {
+ LoginUserInfo loginUser = getLoginUser();
SystemRole systemRole = new SystemRole();
+ systemRole.setType(loginUser.getType());
systemRole.setDeleted(Boolean.FALSE);
return ApiResponse.success(systemRoleService.findList(systemRole));
}
--
Gitblit v1.9.3