diff --git a/src/main/java/com/lz/common/aspect/LogAspect.java b/src/main/java/com/lz/common/aspect/LogAspect.java index d524b3b7..4f45a0b7 100644 --- a/src/main/java/com/lz/common/aspect/LogAspect.java +++ b/src/main/java/com/lz/common/aspect/LogAspect.java @@ -1,6 +1,7 @@ package com.lz.common.aspect; import com.alibaba.fastjson.JSON; +import com.lz.common.exception.RRException; import com.lz.common.utils.OrderUtil; import com.lz.common.utils.R; import com.lz.common.utils.ServletUtils; @@ -111,8 +112,13 @@ public class LogAspect { result = point.proceed(); return result; } catch (Exception e) { + if(e instanceof RRException){ + result = R.error(((RRException) e).getMsg()); + }else{ + result = R.error(); + } logger.error("controller error.", e); - result = R.error(); + } finally { if(cm.toString().toLowerCase().contains("captcha")){ logger.info(StringUtil.appendStrs( diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 0e8720ee..54aa8125 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -826,20 +826,10 @@ public class ResultRecordController extends AbstractController { boolean isSetKeyResult = false; List flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(dto.getId(), 2); if(flowRecords.size() > 0){ - if(dto.getSave() != null && dto.getSave().intValue() ==1){ - if(flowRecords.get(0).getFlowProcess().intValue() < 1){//因为先提交流程在保存,所以这里写了小于2 - //指定目标中 - log.info("暂存制定目标中"); - isSetKeyResult = true; - } - }else{ - if(flowRecords.get(0).getFlowProcess().intValue() < 2){//因为先提交流程在保存,所以这里写了小于2 - //指定目标中 - log.info("制定目标中"); - isSetKeyResult = true; - } + if(flowRecords.get(0).getFlowProcess().intValue() < 1){ + log.info("制定目标中"); + isSetKeyResult = true; } - } @@ -992,7 +982,7 @@ public class ResultRecordController extends AbstractController { resultRecordService.updateResultRecordById(resultRecord); String commentId = null; - if(dto.getSave() == null && editResultDetails.size() > 0){//非暂存 + if(dto.getSave() == null){//非暂存 //修改评论信息 log.info("修改了多少个指标{}", editResultDetails.size()); editResultDetails.addAll(resultDetailService.selectNotNoticeResultDetailByRecordId(dto.getId())) ;