Merge remote-tracking branch 'origin/developer' into developerH

src/main/java/com/caimei/modules/user/service/ClubPortraitService.java

@@ -245,7 +245,7 @@ public class ClubPortraitService {
                 }
                 for (String str : strRemark) {
                     for (CmClubRemarks remarks: remarksList) {
-                        if (remarks.getRemarks().contains(str)) {
+                        if (str.equals(remarks.getRemarks())) {
                             number++;
                         }
                     }

src/main/resources/mappings/modules/user/CmPortraitMapper.xml

@@ -39,7 +39,7 @@
                cbr.accessDate
         FROM cm_behavior_record cbr LEFT JOIN club c ON cbr.userID = c.userID
         <where>
-            cbr.pageType IN (8, 9) AND c.clubID = #{clubID}
+            cbr.pageType IN (8, 9) AND c.clubID = #{clubID} AND cbr.pageLabel IS NOT NULL AND cbr.pageLabel != ''
             <if test="accessDate != null and accessDate != ''">
                 AND cbr.accessDate = #{accessDate}
             </if>