Merge remote-tracking branch 'origin/master'

yz

2021-03-15 c12ca804e93a7f62b006dca60fa3d8797e0480d8

 febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml

@@ -45,11 +45,12 @@
            AND d.dept_name like CONCAT('%',#{user.deptName},'%')
        </if>
        <if test="user.createTimeFrom != null and user.createTimeFrom !=''">
            And u.create_time &gt; #{user.createTimeFrom}
            AND u.create_time &gt; #{user.createTimeFrom}
        </if>
        <if test="user.createTimeTo!= null and user.createTimeTo !=''">
            And u.create_time &lt; #{user.createTimeTo}
            AND u.create_time &lt; #{user.createTimeTo}
        </if>
        AND d.DEPT_ID IN (SELECT DEPT_ID FROM t_user_data_permission WHERE USER_ID= #{currentUserId} )
        group by u.username,u.user_id,u.email,u.mobile,u.status,u.create_time,u.ssex,
        u.dept_id,u.last_login_time,u.modify_time,u.description,u.avatar
    </select>