Merge remote-tracking branch 'origin/dev_guidance' into develop

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/AllPartyResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -38,4 +39,11 @@ public class AllPartyResultDTO implements Serializable {
      * 用户id
      **/
     private String userId;
+
+    public AllPartyResultDTO() {
+        this.point = NumConstant.ZERO;
+        this.userHeadPhoto = "";
+        this.realName = "";
+        this.userId = "";
+    }
 }

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml

@@ -186,6 +186,7 @@
     </select>
 
     <select id="selectListGridPartyNewRankByUsablePoint" resultType="com.epmet.dto.result.AllPartyResultDTO">
+        SET @curRank = 0;
         SELECT
             @curRank := @curRank + 1 AS ranking,
             @point := IFNULL(p.USABLE_POINT, 0),
@@ -203,6 +204,7 @@
     </select>
 
     <select id="selectListGridPartyNewRankByMonth" resultType="com.epmet.dto.result.AllPartyResultDTO">
+        SET @curRank = 0;
         SELECT
             @curRank := @curRank + 1 AS ranking,
             @point := p.point,