diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagAgencyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagAgencyDTO.java
index 1d91a3287a..35cbbc0390 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagAgencyDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagAgencyDTO.java
@@ -47,7 +47,7 @@ public class FactTagAgencyDTO implements Serializable {
/**
* 固定值:文章数量
*/
- private String type="文章数量";
+ private String type="阅读次数";
/**
* 机关Id
diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml
index a818e16cf5..c4c1073c33 100644
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@@ -112,7 +112,7 @@
123456
- true
+ false
122.152.200.70:8848
fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml
index cd536caa30..c7d032eb43 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml
@@ -24,7 +24,7 @@
where agency_id = #{agencyId}
AND month_id = #{monthId}
GROUP BY TAG_ID
- ORDER BY value DESC
+ ORDER BY value DESC ,tagId ASC
LIMIT #{pageSize}
@@ -39,7 +39,7 @@
where agency_id = #{agencyId}
AND quarter_id = #{quarterId}
GROUP BY TAG_ID
- ORDER BY value DESC
+ ORDER BY value DESC ,tagId ASC
LIMIT #{pageSize}
@@ -54,7 +54,7 @@
where agency_id = #{agencyId}
AND year_id = #{yearId}
GROUP BY tag_id
- ORDER BY value DESC
+ ORDER BY value DESC ,tagId ASC
LIMIT #{pageSize}
@@ -69,7 +69,7 @@
where agency_id = #{agencyId}
AND month_id = #{monthId}
GROUP BY TAG_ID
- ORDER BY value DESC
+ ORDER BY value DESC ,tagId ASC
LIMIT #{pageSize}
@@ -84,7 +84,7 @@
where agency_id = #{agencyId}
AND quarter_id = #{quarterId}
GROUP BY TAG_ID
- ORDER BY value DESC
+ ORDER BY value DESC ,tagId ASC
LIMIT #{pageSize}
@@ -99,7 +99,7 @@
where agency_id = #{agencyId}
AND year_id = #{yearId}
GROUP BY tag_id
- ORDER BY value DESC
+ ORDER BY value DESC ,tagId ASC
LIMIT #{pageSize}
@@ -118,6 +118,7 @@
AND pub.PID =#{agencyId}
AND pub.month_id=#{monthId}
GROUP BY pub.agency_id
+ ORDER BY value DESC,agencyId ASC
@@ -136,6 +137,7 @@
AND pub.PID =#{agencyId}
AND pub.quarter_id=#{quarterId}
GROUP BY pub.agency_id
+ ORDER BY value DESC,agencyId ASC
@@ -153,6 +155,7 @@
AND pub.PID =#{agencyId}
AND pub.year_id=#{yearId}
GROUP BY pub.agency_id
+ ORDER BY value DESC,agencyId ASC
@@ -170,6 +173,7 @@
AND pub.agency_id =#{agencyId}
AND pub.month_id=#{monthId}
GROUP BY pub.department_id
+ ORDER BY value DESC,departmentId ASC
@@ -188,6 +192,7 @@
AND pub.agency_id =#{agencyId}
AND pub.quarter_id=#{quarterId}
GROUP BY pub.department_id
+ ORDER BY value DESC,departmentId ASC
@@ -205,6 +210,7 @@
AND pub.agency_id =#{agencyId}
AND pub.year_id=#{yearId}
GROUP BY pub.department_id
+ ORDER BY value DESC,departmentId ASC
@@ -222,6 +228,7 @@
AND pub.agency_id = #{agencyId}
AND pub.month_id=#{monthId}
GROUP BY pub.grid_id
+ ORDER BY value DESC,gridId ASC
@@ -240,6 +247,7 @@
AND pub.agency_id = #{agencyId}
AND pub.quarter_id=#{quarterId}
GROUP BY pub.grid_id
+ ORDER BY value DESC,gridId ASC
@@ -257,6 +265,7 @@
AND pub.agency_id = #{agencyId}
AND pub.year_id = #{yearId}
GROUP BY pub.grid_id
+ ORDER BY value DESC,gridId ASC
\ No newline at end of file