Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-06-08 6bb7db31aaabf2aa5d04d0fe3953652b86b9ad82

 ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml

@@ -78,7 +78,7 @@
         AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{deptId},ancestors) ))
      </if>
      <!-- 数据范围过滤 -->
      ${dataScope}
      ${params.dataScope}
   </select>
   
   <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">