~zhangleilei/supipe.git

			@@ -149,7 +149,9 @@
			t.companyId,
			t.level,
			t.integral,
			su.real_name reporter
			su.real_name reporter,
			t.integral,
			t.level
			from t_hidden_danger t
			LEFT JOIN sys_users su ON su.user_id = t.createUser
			LEFT JOIN sys_users su1 ON su1.user_id = t.updateUser
			@@ -184,6 +186,9 @@
			<if test="startTime!= null and endTime!=null and startTime != '' and endTime !=''">
			and t.createTime BETWEEN #{startTime} and #{endTime}
			</if>
			<if test="createUser!= null and createUser != ''">
			and t.createUser =#{createUser}
			</if>
			order by t.createTime desc
			</select>

			@@ -214,6 +219,9 @@
			<if test="startTime!= null and endTime!=null and startTime != '' and endTime !=''">
			and t.createTime BETWEEN #{startTime} and #{endTime}
			</if>
			<if test="createUser!= null and createUser != ''">
			and t.createUser =#{createUser}
			</if>
			ORDER BY
			t.auditStatus,
			case when t.auditStatus = 0 then t.createTime END,