From 46b833a0f8bb135fdd885ad5960d9c4e2d72def0 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 25 May 2023 16:46:38 +0800
Subject: [PATCH] 用户列表查询修改（新增职位关联查询返回）
---
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml | 26 ++++++++-----
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/IUserService.java | 2
skjcmanager/skjcmanager-service-api/skjcmanager-user-api/src/main/java/cn/gistack/system/user/vo/UserVO.java | 5 ++
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java | 2
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/controller/UserController.java | 7 ++-
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.java | 2
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/wrapper/UserVOWrapper.java | 58 +++++++++++++++++++++++++++++
7 files changed, 86 insertions(+), 16 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-user-api/src/main/java/cn/gistack/system/user/vo/UserVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-user-api/src/main/java/cn/gistack/system/user/vo/UserVO.java
index aa2bc79..934d330 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-user-api/src/main/java/cn/gistack/system/user/vo/UserVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-user-api/src/main/java/cn/gistack/system/user/vo/UserVO.java
@@ -86,4 +86,9 @@
* 行政区划编码
*/
private String adCode;
+
+ /**
+ * 职位名
+ */
+ private String jobName;
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/controller/UserController.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/controller/UserController.java
index 3670f39..c289ae7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/controller/UserController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/controller/UserController.java
@@ -23,6 +23,7 @@
import cn.gistack.system.user.service.IUserService;
import cn.gistack.system.user.service.impl.UserServiceImpl;
import cn.gistack.system.user.vo.UserVO;
+import cn.gistack.system.user.wrapper.UserVOWrapper;
import cn.gistack.system.user.wrapper.UserWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -156,9 +157,9 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
// @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
- return R.data(UserWrapper.build().pageVO(pages));
+ public R<IPage<UserVO>> page(@ApiIgnore UserVO user, Query query, Long deptId, BladeUser bladeUser) {
+ IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ return R.data(UserVOWrapper.build().pageVO(pages));
}
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.java
index 7d8d969..dae9123 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.java
@@ -42,7 +42,7 @@
* @param tenantId
* @return
*/
- List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ List<UserVO> selectUserPage(IPage<UserVO> page, @Param("user") UserVO user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
/**
* 获取用户
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml
index 4276b97..0ec8435 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml
@@ -27,27 +27,33 @@
<result column="post_id" property="postId"/>
</resultMap>
- <select id="selectUserPage" resultMap="userResultMap">
- select * from blade_user where is_deleted = 0
+ <select id="selectUserPage" resultType="cn.gistack.system.user.vo.UserVO">
+ select bu.*,armp.jobName from blade_user bu
+ left join (
+ select "user_phone" as userPhone,CONCAT_WS('-',"user_unit","position") jobName from SJZT_MD."att_res_manage_person" where "guid" in (
+ select max("guid") as guid from SJZT_MD."att_res_manage_person" group by "user_phone"
+ )
+ ) armp on bu.phone = armp.userPhone
+ where bu.is_deleted = 0
<if test="tenantId!=null and tenantId != ''">
- and tenant_id = #{tenantId}
+ and bu.tenant_id = #{tenantId}
</if>
<if test="user.tenantId!=null and user.tenantId != ''">
- and tenant_id = #{user.tenantId}
+ and bu.tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
- and account = #{user.account}
+ and bu.account = #{user.account}
</if>
<if test="user.realName!=null and user.realName != ''">
- and real_name like concat(concat('%',#{user.realName}),'%')
+ and bu.real_name like concat(concat('%',#{user.realName}),'%')
</if>
<if test="user.userType!=null and user.userType != ''">
- and user_type = #{user.userType}
+ and bu.user_type = #{user.userType}
</if>
<if test="user.roleId!=null and user.roleId != ''">
- and role_id like concat('%',#{user.roleId},'%')
+ and bu.role_id like concat('%',#{user.roleId},'%')
</if>
- <if test="deptIdList!=null and deptIdList.size>0">
+ <if test="deptIdList!=null and deptIdList.size()>0">
and id in (
SELECT
user_id
@@ -60,7 +66,7 @@
</foreach>
)
</if>
- ORDER BY id
+ ORDER BY bu.id
</select>
<select id="getUser" resultMap="userResultMap">
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/IUserService.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/IUserService.java
index 320bea4..266ceef 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/IUserService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/IUserService.java
@@ -70,7 +70,7 @@
* @param tenantId
* @return
*/
- IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId);
+ IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId);
/**
* 自定义分页
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java
index 85eb01f..fe6248e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java
@@ -142,7 +142,7 @@
}
@Override
- public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
+ public IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/wrapper/UserVOWrapper.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/wrapper/UserVOWrapper.java
new file mode 100644
index 0000000..a1b9d46
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/wrapper/UserVOWrapper.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package cn.gistack.system.user.wrapper;
+
+import cn.gistack.system.cache.DictCache;
+import cn.gistack.system.cache.SysCache;
+import cn.gistack.system.entity.Tenant;
+import cn.gistack.system.enums.DictEnum;
+import cn.gistack.system.user.vo.UserVO;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 包装类,返回视图层所需的字段
+ *
+ * @author Chill
+ */
+public class UserVOWrapper extends BaseEntityWrapper<UserVO, UserVO> {
+
+ public static UserVOWrapper build() {
+ return new UserVOWrapper();
+ }
+
+ @Override
+ public UserVO entityVO(UserVO user) {
+ UserVO userVO = Objects.requireNonNull(BeanUtil.copy(user, UserVO.class));
+ Tenant tenant = SysCache.getTenant(user.getTenantId());
+ List<String> roleName = SysCache.getRoleNames(user.getRoleId());
+ List<String> deptName = SysCache.getDeptNames(user.getDeptId());
+ List<String> postName = SysCache.getPostNames(user.getPostId());
+ userVO.setTenantName(tenant.getTenantName());
+ userVO.setRoleName(Func.join(roleName));
+ userVO.setDeptName(Func.join(deptName));
+ userVO.setPostName(Func.join(postName));
+ userVO.setSexName(DictCache.getValue(DictEnum.SEX, user.getSex()));
+ userVO.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
+ return userVO;
+ }
+
+}
--
Gitblit v1.9.3