Merge branch 'master' into master-任务组

陈昶聿

12 小时以前 6e3d0a2097a4d841e941a84ec54780a67eb60ba1

 smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml

@@ -26,11 +26,10 @@
    <select id="selectUserRoleByRoleIdAndUserId" resultMap="SysUserRoleResult">
        select user_id,role_id,guid,orgid
        from sys_user_role
        <where>
        where 1=1
            <if test="roleId != null ">and role_id = #{roleId}</if>
            <if test="userId != null ">and user_id = #{userId}</if>

        </where>
    </select>

    <delete id="deleteUserRole" parameterType="Long">