From e487f1bfa92d9e90dd8f876479bbfced09b4d58c Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 29 十二月 2023 14:04:18 +0800
Subject: [PATCH] 添加角色查询接口
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 25 ++++++++++++
consum-base/src/main/java/com/consum/base/pojo/RolePageParam.java | 19 +++++++++
consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java | 6 ++
consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java | 24 ++++++++++++
4 files changed, 73 insertions(+), 1 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index 8dea44c..2654c55 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -34,6 +34,7 @@
import com.consum.base.pojo.FinSysTenantUserSearchParam;
import com.consum.base.pojo.FinSysTenantUserUpdParam;
import com.consum.base.pojo.ImportUserParam;
+import com.consum.base.pojo.RolePageParam;
import com.consum.base.pojo.request.FinSysTenantUserParam;
import com.consum.base.pojo.response.DepartmentVO;
import com.consum.base.pojo.response.FinSysTenantUserVO;
@@ -54,6 +55,7 @@
import com.iplatform.model.po.S_dept;
import com.iplatform.model.po.S_role;
import com.iplatform.model.po.S_user_core;
+import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.NumberGenerator;
@@ -847,4 +849,27 @@
return ResponseValue.success(finSysTenantVO);
}
+ @GetMapping("/query/role")
+ public ResponseValue pageList() {
+ RolePageParam roleParam = CommonUtil.getObjFromReq(RolePageParam.class);
+ RolePageParam param2 = new RolePageParam();
+ CommonUtil.copyProperties(roleParam, param2);
+ roleParam = param2;
+ if (roleParam != null && roleParam.getOrgId() > 0L) {
+ long orgId = 0L;
+ if (!this.isSupervisor()) {
+ orgId = this.getCurrentUser().getOrg_id();
+ } else {
+ orgId = roleParam.getOrgId();
+ }
+
+ FinSysTenantUser finSysTenantUser = this.getSysInfo();
+ Integer dataScope = finSysTenantUser.getLv();
+ GenericPager<S_role> pager = finSysTenantUserService.queryPageRoleList(orgId, roleParam.getStatus(),
+ roleParam.getRoleName(), dataScope,roleParam.getPageNum(), roleParam.getPageSize());
+ return ResponseValue.success(pager);
+ } else {
+ return ResponseValue.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/RolePageParam.java b/consum-base/src/main/java/com/consum/base/pojo/RolePageParam.java
new file mode 100644
index 0000000..621b6c2
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/RolePageParam.java
@@ -0,0 +1,19 @@
+package com.consum.base.pojo;
+
+import lombok.Data;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: TODO
+ * @date 2023/12/29 13:52
+ */
+@Data
+public class RolePageParam {
+
+ private Long orgId = 0L;
+ private Integer status = -1;
+ private String roleName;
+ private Integer pageSize;
+ private Integer pageNum;
+}
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 5104777..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
@@ -1,13 +1,14 @@
package com.consum.base.service;
-import com.consum.base.pojo.response.FinSysTenantUserVO;
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;
+import com.walker.db.page.GenericPager;
import com.walker.jdbc.service.BaseService;
/**
@@ -41,4 +42,7 @@
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);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java
index d40f9dd..5fce70f 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java
@@ -269,4 +269,28 @@
public List<FinSysTenantUser> getByOrgId(Long orgId) {
return this.select(SQL_GET_USER, new Object[] {orgId}, new FinSysTenantUser());
}
+
+ @Override
+ public GenericPager<S_role> queryPageRoleList(Long orgId, Integer status, String roleName, Integer dataScope,
+ Integer pageNum, Integer pageSize) {
+ Map<String, Object> parameters = new HashMap();
+ StringBuilder sql = new StringBuilder("select * from s_role where org_id=:orgId");
+ parameters.put("orgId", orgId);
+ if (status >= 0) {
+ sql.append(" and status=:status");
+ parameters.put("status", status);
+ }
+
+ if (dataScope != null) {
+ sql.append(" and data_scope >=:dataScope");
+ parameters.put("dataScope", dataScope);
+ }
+
+ if (com.walker.infrastructure.utils.StringUtils.isNotEmpty(roleName)) {
+ sql.append(" and role_name like :roleName");
+ parameters.put("roleName", "%" + roleName + "%");
+ }
+
+ return this.selectSplit(sql.toString(), parameters, pageNum, pageSize, new S_role());
+ }
}
--
Gitblit v1.9.1