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 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

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
             *

--
Gitblit v1.9.3