Merge branch 'dev' into pre-production

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

@@ -62,7 +62,10 @@
         SELECT
         si.*,
         sc.NAME AS classifyName
-        WHERE si.assess_dept = #{params.deptId}
+        FROM
+        sup_indicators AS si
+        LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id
+        WHERE si.assess_dept = #{params.deptId} AND si.is_deleted = 0 AND sc.is_deleted = 0
         <if test="params.startTime != null and params.startTime != ''" >
             AND date_format(si.create_time,'%y%m%d%') >= date_format(#{params.startTime},'%y%m%d%')
         </if>
@@ -73,7 +76,7 @@
     </select>
     <select id="selectMyPoints" resultType="com.logpm.supervise.vo.api.BeIndicatorsVO">
         <![CDATA[
-            select 0 As totalPoints,
+         SELECT 0 As totalPoints,
         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