From 4325565ac6a3028f1071602e067b41e5932faa79 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期二, 02 一月 2024 16:05:52 +0800
Subject: [PATCH] 1、增加登录系统日志 2、修改上传文件，名称判断错误问题 3、修改单据新增时，仓库判断问题
---
consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
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 5a6a9fe..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
@@ -29,7 +29,7 @@
private static final String SQL_GET_USER =
"SELECT * FROM fin_sys_tenant_user WHERE IS_DELETE = 0 AND `STATUS` = 1 AND TENANT_ID = ?";
private static final String SQL_QH_PAGE_USER_PREFIX =
- "select fstu.id,fstu.USER_CODE,fstu.USER_NAME,fstu.USER_PHONE,fst.name tenantName,fstd.name sysDeptName,fst.STATUS from FIN_SYS_TENANT_USER fstu "
+ "select fstu.id,fstu.USER_CODE,fstu.USER_NAME,fstu.USER_PHONE,fst.name tenantName,fstd.name sysDeptName,fstu.STATUS from FIN_SYS_TENANT_USER fstu "
+ "left join fin_sys_tenant fst on fst.id =fstu.TENANT_ID "
+ "left join fin_sys_tenant_department fstd on fstd.id = fstu.SYS_DEPT_ID where fstu.IS_DELETE = 0 ";
@@ -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