Merge branch 'dev' into pre-production

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml

@@ -72,12 +72,14 @@
         GROUP BY si.classify_id
     </select>
     <select id="selectMyPoints" resultType="com.logpm.supervise.vo.api.BeIndicatorsVO">
+        <![CDATA[
             select 0 As totalPoints,
-        sum(case  when point &lt; 0 then point else 0 end) as deductionPoints ,
-        sum(case  when point &gt; 0 then point else 0 end) as bonusPoins
+        sum(case  when point < 0 then point else 0 end) as deductionPoints ,
+        sum(case  when point > 0 then point else 0 end) as bonusPoins
         from sup_indicators
         where assess_dept = #{params.deptId}
         and DATE_FORMAT(create_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+        ]]>
     </select>
 
 </mapper>