Merge branch 'dev' into pre-production

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -374,9 +374,6 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 	@Override
 	public R myApiIndicatorsDetail(Long id,Long classifyId) {
 		IndicatorsEntity indicatorsEntity = iIndicatorsService.getById(id);
-		if (2 == indicatorsEntity.getIndicatorsStatus()){
-			return R.fail("已确认考核无法进行修改");
-		}
 		//查询是否存在有附件
 		List<IndicatorsAnnexEntity> list = indicatorsAnnexService.list(Wrappers.<IndicatorsAnnexEntity>query().lambda().eq(IndicatorsAnnexEntity::getIndicatorsId, id));
 		IndicatorsVO indicatorsVO = IndicatorsWrapper.build().entityVO(indicatorsEntity);
@@ -444,6 +441,9 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 			handleResource(instanceofDTO.getResourceList(), instanceofDTO.getId());
 		}
 		IndicatorsEntity indicatorsEntity = Func.copy(instanceofDTO, IndicatorsEntity.class);
+		if (2 == indicatorsEntity.getIndicatorsStatus()){
+			return R.fail("已确认考核无法进行修改");
+		}
 		if (Func.isNotEmpty(instanceofDTO.getAppealReason())){
 			indicatorsEntity.setIsObjection(1);
 		}