From 9c20f268e0628017d09427989724cdf2a8e9e8e2 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 12:47:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/company/src/main/java/com/doumee/api/system/SystemRoleController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/system/SystemRoleController.java b/server/company/src/main/java/com/doumee/api/system/SystemRoleController.java
index a81ad34..eeb9125 100644
--- a/server/company/src/main/java/com/doumee/api/system/SystemRoleController.java
+++ b/server/company/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,8 +106,12 @@
@GetMapping("/all")
@RequiresPermissions("system:role:query")
public ApiResponse<List<SystemRole>> findAll () {
+ LoginUserInfo userInfo = this.getLoginUser();
SystemRole systemRole = new SystemRole();
systemRole.setDeleted(Boolean.FALSE);
+ if(userInfo.getType().equals(Constants.ONE)){
+ systemRole.setType(userInfo.getType());
+ }
return ApiResponse.success(systemRoleService.findList(systemRole));
}
}
--
Gitblit v1.9.3