diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml index 73b58aeb1..f2fb2742e 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml @@ -90,7 +90,7 @@ 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} + where assess_dept = #{params.deptId} AND is_deleted = 0 and DATE_FORMAT(create_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') ]]> diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index 24b36879e..d3ecfae87 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -374,6 +374,9 @@ public class ClassifyServiceImpl extends BaseServiceImpl list = indicatorsAnnexService.list(Wrappers.query().lambda().eq(IndicatorsAnnexEntity::getIndicatorsId, id)); IndicatorsVO indicatorsVO = IndicatorsWrapper.build().entityVO(indicatorsEntity);