From 48ef443170ee0cc12268bda0c686ffbd1d81671c Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 02 一月 2024 14:26:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java b/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java
index 8143561..81562f0 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java
+++ b/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java
@@ -2,7 +2,9 @@
import java.util.List;
+import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.FinSysTenantUserSearchParam;
+import com.consum.base.pojo.response.FinSysTenantUserVO;
import com.consum.model.po.FinSysTenantUser;
import com.iplatform.model.po.S_dept;
import com.iplatform.model.po.S_role;
@@ -17,7 +19,7 @@
**/
public interface FinSysTenantUserService extends BaseService {
- GenericPager<FinSysTenantUser> queryAllPageUser(FinSysTenantUserSearchParam param);
+ PageUtil<FinSysTenantUserVO> queryAllPageUser(FinSysTenantUserSearchParam param);
FinSysTenantUser queryOneById(String id);
@@ -33,11 +35,14 @@
FinSysTenantUser getByUserCode(String userCode);
- List<S_role> getByUserId(Long userId);
+ List<S_role> getRoleBySysUserId(Long userId);
List<S_role> getRoleAll();
List<S_dept> selectDept(String deptName);
List<FinSysTenantUser> getByOrgId(Long orgId);
+
+ GenericPager<S_role> queryPageRoleList(Long orgId, Integer status, String roleName, Integer dataScope, Integer pageNum,
+ Integer pageSize);
}
--
Gitblit v1.9.1