Commit 0ecf27f8d6196bf023767081759fcef1171283b0
1 parent
0a5bb34f
去除多余的空格
Showing
2 changed files
with
2 additions
and
1 deletions
ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
| @@ -123,4 +123,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -123,4 +123,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 123 | #{item.columnId} | 123 | #{item.columnId} |
| 124 | </foreach> | 124 | </foreach> |
| 125 | </delete> | 125 | </delete> |
| 126 | + | ||
| 126 | </mapper> | 127 | </mapper> |
| 127 | \ No newline at end of file | 128 | \ No newline at end of file |
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
| @@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | @@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||
| 75 | AND date_format(u.create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') | 75 | AND date_format(u.create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') |
| 76 | </if> | 76 | </if> |
| 77 | <if test="deptId != null and deptId != 0"> | 77 | <if test="deptId != null and deptId != 0"> |
| 78 | - AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{deptId},ancestors) )) | 78 | + AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) )) |
| 79 | </if> | 79 | </if> |
| 80 | <!-- 数据范围过滤 --> | 80 | <!-- 数据范围过滤 --> |
| 81 | ${params.dataScope} | 81 | ${params.dataScope} |