Merge branch 'dev' into pre-production

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

@@ -62,6 +62,8 @@
         WHEN 1 then '已提交'
         WHEN 2 then '已确认'
         END AS indicatorsStatusName
+        FROM sup_indicators AS  si
+        LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id
          WHERE si.is_deleted = 0 and si.create_user = #{params.userId} AND sc.is_deleted = 0
         <if test="params.assessDept != null and params.assessDept != ''" >
             and si.assess_dept = #{params.assessDept}