Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-10 f4495e2587c0ba7c2085d3db0cbaca0d3fa30489

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

@@ -293,6 +293,6 @@
    </select>

    <select id="userByPlanId" parameterType="String" resultMap="SysUserResult">
        select nick_name from sys_user where id in (select app_user_id from ard_app_patroluser where patrolplan_id = ${id})
        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>