diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 3a9ff2d..fb8a8aa 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -39,6 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND dept_name like concat('%', cast(#{deptName, jdbcType=VARCHAR} as varchar), '%') + + AND d.order_num = #{orderNum} + AND status = #{status} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 822d665..3e9700e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -25,13 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor - AND ipaddr like concat('%', #{ipaddr}, '%') + AND ipaddr like concat('%', CAST(#{ipaddr} AS VARCHAR), '%') AND status = #{status} - AND user_name like concat('%', #{userName}, '%') + AND user_name like concat('%', CAST(#{userName} AS VARCHAR), '%') AND login_time >= #{params.beginTime} @@ -54,4 +54,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" truncate table sys_logininfor - \ No newline at end of file +