三一车辆sdk引入提交

zhangnaisong

2023-07-22 c511bd724b1a34411b8e28116bbc5baf9353a03d

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

@@ -23,6 +23,7 @@
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="cameraPriority" column="camera_priority"/>
        <result property="rongCloudToken" column="rong_cloud_token"/>
        <result property="remark" column="remark"/>
        <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
        <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -64,6 +65,7 @@
               u.create_by,
               u.create_time,
               u.camera_priority,
               u.rong_cloud_token,
               u.remark,
               d.dept_id,
               d.parent_id,
@@ -85,10 +87,10 @@
    </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, d.dept_name, d.leader from sys_user
        u
        left join sys_dept d on u.dept_id = d.dept_id
--         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 != ''">
            AND u.user_id = #{userId}
@@ -185,7 +187,7 @@

    <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
        insert into sys_user(
        <if test="userId != null and userId != 0">user_id,</if>
        <if test="userId != null and userId != ''">user_id,</if>
        <if test="deptId != null and deptId != 0">dept_id,</if>
        <if test="userName != null and userName != ''">user_name,</if>
        <if test="nickName != null and nickName != ''">nick_name,</if>
@@ -234,6 +236,7 @@
            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
            <if test="remark != null">remark = #{remark},</if>
            <if test="cameraPriority != null">camera_priority = #{cameraPriority},</if>
            <if test="rongCloudToken != null">rong_cloud_token = #{rongCloudToken},</if>
            update_time = now()
        </set>
        where user_id = #{userId}