From 6d94fd36f78fc4b24cace57b110faeda1358a34e Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 18 Dec 2020 11:15:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..7fa13674 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -992,7 +992,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())) ; From 5948f4eee5987588d62f88ec8ebd3a75c0fc991b Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 18 Dec 2020 11:22:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ResultRecordController.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) 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 7fa13674..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; } - } From 87885eca0cc8d9ef30d965c49b3cdf5b1ff13b4b Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 18 Dec 2020 11:58:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=BC=82=E5=B8=B8=E7=82=AE=E7=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/common/aspect/LogAspect.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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(