From e2616f675df2983fd42dd5179e3a1adfe0788f89 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 7 Dec 2020 13:37:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9commandId=E4=B8=BAcommentId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/app/controller/ResultRecordController.java   | 6 +++---
 .../com/lz/modules/flow/model/ResultRecordDetailDto.java    | 2 +-
 2 files changed, 4 insertions(+), 4 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 deecf083..31b6d724 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -812,7 +812,7 @@ public class ResultRecordController extends AbstractController {
                     }
 
                 }
-                if(dto.getCommandId() != null && dto.getCommandId().intValue() > 0 && resultDetail1 != null){
+                if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0 && resultDetail1 != null){
                     //有评论id
                     if(resultDetail1.getIsDelete().intValue() == 1){
                         commandValue += (commandIndex + "(删除)" + resultDetail1.getTarget() + "\r\n");
@@ -907,9 +907,9 @@ public class ResultRecordController extends AbstractController {
 
         resultRecordService.updateResultRecordById(resultRecord);
 
-        if(dto.getCommandId() != null && dto.getCommandId().intValue() > 0 && commandValue.length() > 0){
+        if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0 && commandValue.length() > 0){
             //修改评论信息
-            resultCommentService.updateResultCommentCommentById(dto.getCommandId(), commandValue);
+            resultCommentService.updateResultCommentCommentById(dto.getCommentId(), commandValue);
         }
 
         return R.ok();
diff --git a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java
index 19d1ad27..58648fbf 100644
--- a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java
+++ b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java
@@ -34,7 +34,7 @@ public class ResultRecordDetailDto {
     @ApiModelProperty(value = "备注", name = "remark")
     private String remark;
     @ApiModelProperty(value = "业绩评论id", name = "commandId")
-    private Long commandId;
+    private Long commentId;
     //员工id
     @ApiModelProperty(value = "员工id", name = "staffId")
     private Long staffId;