提交

‘liusuyi’

2023-10-14 990782ab2c75805ef0390e40255ca817a02aa0bd

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -25,6 +25,7 @@
        <result property="cameraPriority" column="camera_priority"/>
        <result property="rongCloudToken" column="rong_cloud_token"/>
        <result property="appUserType" column="app_user_type"/>
        <result property="appOnlineState" column="app_online_state"/>
        <result property="remark" column="remark"/>
        <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
        <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -68,6 +69,7 @@
               u.camera_priority,
               u.rong_cloud_token,
               u.app_user_type,
               u.app_online_state,
               u.remark,
               d.dept_id,
               d.parent_id,
@@ -110,6 +112,9 @@
            AND u.create_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD')
        </if>
        <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>
@@ -242,6 +247,7 @@
            <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>
            <if test="appOnlineState != null">app_online_state = #{appOnlineState},</if>
            update_time = now()
        </set>
        where user_id = #{userId}
@@ -285,4 +291,8 @@
        inner join sys_dept sd on asy.dept_id = sd.dept_id
        where asy.car_id = #{carId})
    </select>

    <select id="userByPlanId" parameterType="String" resultMap="SysUserResult">
        select user_id,nick_name from sys_user where user_id in (select app_user_id from ard_app_patroluser where patrolplan_id = #{id})
    </select>
</mapper>