Merge remote-tracking branch 'origin/master'

cooleshow-cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -68,18 +68,22 @@
 						and if(sni.online_time_ is not null,sni.online_time_ <= now(),1=1)
 						and if(sni.offline_time_ is not null,sni.offline_time_ >= now(),1=1)
 					</if>
+					<if test="type == 4">
+						<choose>
+							<when test="platformType == 'WEBSITE'">
+								and sni.client_type_ = #{platformType}
+							</when>
+							<when test="platformType == 'STUDENT'">
+								and sni.client_type_ = #{platformType}
+							</when>
+						</choose>
+					</if>
 				</if>
-				<if test="type == 4">
-					<choose>
-						<when test="platformType == 'WEBSITE'">
-							and sni.client_type_ = #{platformType}
-						</when>
-						<when test="platformType == 'STUDENT'">
-							and sni.client_type_ = #{platformType}
-						</when>
-					</choose>
+				<if test="platformType == 'ADMIN'" >
+					<if test="clientType != null and clientType != ''">
+						and sni.client_type_ = #{clientType}
+					</if>
 				</if>
-
 			</if>
 			<if test="excludeIds!=null and excludeIds.size()>0">
 				AND sni.id_ NOT IN