From bfc9d5ca46948fbe0623211c030de200df04aba2 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 28 七月 2023 12:39:05 +0800
Subject: [PATCH] 删除任务查看时间和查看位置 增加任务详情打卡时间

---
 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 5f916c9..4479047 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -24,6 +24,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="cameraPriority" column="camera_priority"/>
         <result property="rongCloudToken" column="rong_cloud_token"/>
+        <result property="appUserType" column="app_user_type"/>
         <result property="remark" column="remark"/>
         <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -66,6 +67,7 @@
                u.create_time,
                u.camera_priority,
                u.rong_cloud_token,
+               u.app_user_type,
                u.remark,
                d.dept_id,
                d.parent_id,
@@ -87,9 +89,6 @@
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
---         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
---         u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.camera_priority,u.rong_cloud_token, d.dept_name, d.leader from sys_user u
---         left join sys_dept d on u.dept_id = d.dept_id
         <include refid="selectUserVo"/>
         where u.del_flag = '0'
         <if test="userId != null and userId != ''">
@@ -110,23 +109,19 @@
         <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
             AND u.create_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD')
         </if>
-        <if test="deptId != null and deptId != 0">
-            AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE cast(#{deptId} as
-            varchar) = any(string_to_array(ancestors,',')) ))
+        <if test="appUserType!=null and appUserType!=''"> AND u.app_user_type = #{appUserType}</if>
+        <if test="deptId != null ">and (d.dept_id = #{deptId} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t
+            WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
         </if>
         <!-- 鏁版嵁鑼冨洿杩囨护 -->
         ${params.dataScope}
     </select>
-    <select id="selectAppUserList" parameterType="SysUser" resultMap="SysUserResult">
+    <select id="selectAllAppUserList" parameterType="SysUser" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
-        where u.del_flag = '0'
-        and LOWER(r.role_name) like '%app%'
-        <if test="deptId != null and deptId != 0">
-            AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE cast(#{deptId} as
-            varchar) = any(string_to_array(ancestors,',')) ))
+        where u.del_flag = '0' and u.app_user_type in('0','1')
+        <if test="deptId != null ">and (d.dept_id = #{deptId} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t
+            WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
         </if>
-        <!-- 鏁版嵁鑼冨洿杩囨护 -->
-        ${params.dataScope}
     </select>
     <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
@@ -210,6 +205,7 @@
         <if test="createBy != null and createBy != ''">create_by,</if>
         <if test="remark != null and remark != ''">remark,</if>
         <if test="cameraPriority != null">camera_priority,</if>
+        <if test="appUserType != null and appUserType != ''">app_user_type,</if>
         create_time
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
@@ -225,6 +221,7 @@
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         <if test="remark != null and remark != ''">#{remark},</if>
         <if test="cameraPriority != null">#{cameraPriority},</if>
+        <if test="appUserType != null">#{appUserType},</if>
         now()
         )
     </insert>
@@ -247,6 +244,7 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="cameraPriority != null">camera_priority = #{cameraPriority},</if>
             <if test="rongCloudToken != null">rong_cloud_token = #{rongCloudToken},</if>
+            <if test="appUserType != null">app_user_type = #{appUserType},</if>
             update_time = now()
         </set>
         where user_id = #{userId}

--
Gitblit v1.9.3