From eceb0c8f9480995c8a17f1d093f4e658268b234c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 16 Jul 2021 15:46:30 +0800
Subject: [PATCH] 警情任务分类显示问题修复
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 41 ++++++++++++++++++++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 11 +++++
src/main/java/org/springblade/modules/system/controller/UserController.java | 17 ++++++++
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 10 +++++
src/main/java/org/springblade/modules/system/service/IUserService.java | 10 +++++
5 files changed, 89 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 5d70177..3032cb3 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -178,6 +178,23 @@
IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user, deptId);
return R.data(UserWrapper.build().pageVO(pages));
}
+
+ /**
+ * 自定义用户列表(带坐标)
+ */
+ @GetMapping("/pagetxl")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
+ @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
+ })
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "列表", notes = "传入account和realName")
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ public R<IPage<UserVO>> pagetxl(@ApiIgnore User user, Query query, String deptId, BladeUser bladeUser) {
+ IPage<User> pages = userService.selectUserPagetxl(Condition.getPage(query), user, deptId);
+ return R.data(UserWrapper.build().pageVO(pages));
+ }
+
/**
* 新增或修改
*/
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 5bc89e3..59af447 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -54,6 +54,16 @@
* @return
*/
List<User> selectUserPages(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<String> deptIdList);
+ /**
+ * 自定义分页(带坐标)通讯录
+ *
+ * @param page
+ * @param user
+ * @param deptIdList
+ * @param
+ * @return
+ */
+ List<User> selectUserPagetxl(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<String> deptIdList);
/**
* 获取用户
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 2d7d5d5..71692b9 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -133,6 +133,47 @@
</if>
ORDER BY id
</select>
+
+ <select id="selectUserPagetxl" resultMap="userResultMaps">
+ select s.*,p.jd,p.wd,ST_ASTEXT ( e.coordinate ) from blade_user s
+ LEFT JOIN sys_position p ON p.snumber = s.CODE
+ LEFT JOIN sys_enclosure e ON e.anumber = s.CODE
+ left join
+ blade_role br
+ on
+ s.role_id=br.id
+ where s.is_deleted = 0 AND br.role_name NOT LIKE '%管理员%'
+ <if test="user.account!=null and user.account != ''">
+ and s.account = #{user.account}
+ </if>
+ <if test="user.id!=null and user.id != ''">
+ and s.id = #{user.id}
+ </if>
+ <if test="user.realName!=null and user.realName != ''">
+ and s.real_name = #{user.realName}
+ </if>
+ <if test="user.userType!=null and user.userType != ''">
+ and s.user_type = #{user.userType}
+ </if>
+ <if test="user.examination_type!=null and user.examination_type != ''">
+ and s.examination_type = #{user.examination_type}
+ </if>
+ <if test="deptIdList!=null and deptIdList.size>0">
+ and s.id in (
+ SELECT
+ user_id
+ FROM
+ blade_user_dept
+ WHERE
+ dept_id IN
+ <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ )
+ </if>
+ ORDER BY id
+ </select>
+
<select id="getUser" resultMap="userResultMap">
SELECT
*
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 6fc14ac..01d8292 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -85,6 +85,16 @@
* @return
*/
IPage<User> selectUserPages(IPage<User> page, User user, String deptId);
+ /**
+ * 自定义分页(带坐标)
+ *
+ * @param page
+ * @param user
+ * @param deptId
+ * @param
+ * @return
+ */
+ IPage<User> selectUserPagetxl(IPage<User> page, User user, String deptId);
/**
* 自定义分页
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index c8525a0..d653e66 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -157,6 +157,17 @@
}
@Override
+ public IPage<User> selectUserPagetxl(IPage<User> page, User user, String deptId) {
+ if (deptId != null && !deptId.equals("")){
+ String arr =deptId.toString();
+ List<String> array = Arrays.asList(arr.split(","));
+ return page.setRecords(baseMapper.selectUserPagetxl(page, user, array));
+ }else{
+ return page.setRecords(baseMapper.selectUserPagetxl(page, user, null));
+ }
+ }
+
+ @Override
public IPage<UserVO> selectUserSearch(UserVO user, Query query) {
LambdaQueryWrapper<User> queryWrapper = Wrappers.<User>query().lambda();
if (StringUtil.isNotBlank(user.getName())) {
--
Gitblit v1.9.3