Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/BaseMonitor

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

@@ -271,7 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_user u
 		<where>
 			<if test="userName != null and userName != ''">
-				and u.user_name like concat('%', #{userName}, '%') 
+				and u.user_name like concat('%', #{userName}, '%')
 			</if>
 			<if test="nickName != null and nickName != ''">
 				and u.nick_name like concat('%', #{nickName}, '%')
@@ -289,10 +289,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				and
 				<trim prefix="(" prefixOverrides="or" suffix=")">
 				<if test="dsUserId != null and dsUserId != ''">
-					or u.create_by=#{dsUserId}  
+					or u.create_by=#{dsUserId}
 				</if>
 				<if test="dsDeptId != null and dsDeptId != 0">
-					or u.dept_id=#{dsDeptId}  
+					or u.dept_id=#{dsDeptId}
 				</if>
 				<if test="dsDeptIds != null">
 					or u.dept_id in
@@ -304,6 +304,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			</if>
 			and u.del_flag = '1'
 		</where>
+		order by u.create_time desc
 	</select>
-     
+
 </mapper>