From 2d02dee9812ff906c0a5db97a5d04154bf54fa3f Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 13 十二月 2023 17:39:58 +0800
Subject: [PATCH] 修改用户角色关联
---
consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantUserServiceImpl.java | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 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 eaf3dad..5a6a9fe 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
@@ -5,9 +5,14 @@
import java.util.List;
import java.util.Map;
+import org.apache.commons.compress.utils.Lists;
import org.springframework.stereotype.Service;
+import com.consum.base.core.utils.MapUtils;
+import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.FinSysTenantUserSearchParam;
+import com.consum.base.pojo.response.FinSysTenantUserVO;
import com.consum.base.service.FinSysTenantUserService;
import com.consum.model.po.FinSysTenantUser;
import com.iplatform.base.util.PlatformRSAUtils;
@@ -24,7 +29,9 @@
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.* from FIN_SYS_TENANT_USER fstu where fstu.IS_DELETE = 0 ";
+ "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 "
+ + "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 ";
private static final String SQL_TENANT_USER =
"select fstu.*, fst.TENANT_NAME, fst.LV from FIN_SYS_TENANT_USER fstu\n"
@@ -47,8 +54,8 @@
* @Date 2023/7/17 14:26
*/
@Override
- public GenericPager<FinSysTenantUser> queryAllPageUser(FinSysTenantUserSearchParam param) {
- Map<String, Object> parameter = new HashMap<>(5);
+ public PageUtil<FinSysTenantUserVO> queryAllPageUser(FinSysTenantUserSearchParam param) {
+ Map<String, Object> parameter = new HashMap<>(10);
StringBuilder sql = new StringBuilder(SQL_QH_PAGE_USER_PREFIX);
if (param.getTenantCode() > 0) {
sql.append(" and fstu.TENANT_CODE =:tenantCode");
@@ -66,19 +73,11 @@
sql.append(" and USER_CODE like :USER_CODE");
parameter.put("USER_CODE", StringUtils.CHAR_PERCENT + param.getUserCode() + StringUtils.CHAR_PERCENT);
}
- // if(StringUtils.isNotEmpty(param.getUserCode())){
- // sql.append(" and user_code like :user_code");
- // parameter.put("user_code", StringUtils.CHAR_PERCENT + param.getUserCode() + StringUtils.CHAR_PERCENT);
- // }
+
if (param.getStatus() != null) {
- sql.append(" and status =:status");
+ sql.append(" and fstu.status =:status");
parameter.put("status", param.getStatus());
}
-
- // if(param.getRoleId()!=null &&!param.getRoleId().equals("")){
- // sql.append(" and fstu.SYS_USER_ID in (select user_id from s_role_user where role_id = :role_id)");
- // parameter.put("role_id", param.getRoleId());
- // }
if (StringUtils.isNotEmpty(param.getUserPhone())) {
sql.append(" and USER_PHONE =:userPhone");
@@ -111,8 +110,19 @@
sql.append(" and fstu.AGENT_JID is null ");
}
}
- sql.append(" ORDER BY SEQ asc ,CREATE_TIME desc");
- return this.selectSplit(sql.toString(), parameter, new FinSysTenantUser());
+ sql.append(" ORDER BY SEQ asc ,fstu.CREATE_TIME desc");
+
+ GenericPager<Map<String, Object>> mapGenericPager =
+ this.selectSplit(sql.toString(), parameter, param.getPageNum(), param.getPageSize(), new MapperUtil());
+ PageUtil pageUtil = new PageUtil(mapGenericPager);
+
+ List<FinSysTenantUserVO> result = Lists.newArrayList();
+ mapGenericPager.getDatas().forEach(map -> {
+ FinSysTenantUserVO finSysTenantUserVO = MapUtils.convertMapToObj(map, FinSysTenantUserVO.class);
+ result.add(finSysTenantUserVO);
+ });
+ pageUtil.setDatas(result);
+ return pageUtil;
}
@Override
@@ -218,10 +228,10 @@
* @return
*/
@Override
- public List<S_role> getByUserId(Long userId) {
+ public List<S_role> getRoleBySysUserId(Long userId) {
Map<String, Object> parameter = new HashMap<>();
- StringBuilder sql = new StringBuilder(SQL_SELECT_USER_ID);
- sql.append("and ROLE_ID IN (SELECT DISTINCT(ROLE_ID) FROM S_ROLE_USER WHERE USER_ID= :userId )");
+ StringBuilder sql = new StringBuilder("SELECT * FROM S_ROLE where ");
+ sql.append("ROLE_ID IN (SELECT DISTINCT(ROLE_ID) FROM S_ROLE_USER WHERE USER_ID= :userId )");
parameter.put("userId", userId);
List<S_role> select = this.select(sql.toString(), parameter, new S_role());
return select;
--
Gitblit v1.9.1