From 0c06fa4d45b9b7f3de4dc65bb6fbf2ef0441c186 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Mon, 27 Jul 2020 17:59:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF-bug=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=87=E9=A2=98,=E5=A2=9E=E5=8A=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=96=B9=E6=B3=95check=E3=80=91=20=E9=AD=8F=E5=87=AF?=
 =?UTF-8?q?=202020-07-27?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluate/excel/EvaluateOfficerExcel.java       | 14 +++++++++-----
 .../phrases/service/impl/ActPhraseServiceImpl.java |  6 ++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java
index a2359e974..e7429598c 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java
@@ -44,14 +44,18 @@ public class EvaluateOfficerExcel {
     @Excel(name = "单位职务")
     private String position;
 
+    @Excel(name = "创建时间")
+    private String createTime;
+
     @Excel(name = "排序")
     private Integer sort;
 
-    @Excel(name = "点赞次数")
-    private Integer likesCount;
 
-    @Excel(name = "被踩次数")
-    private Integer opposeCount;
+//    @Excel(name = "点赞次数")
+//    private Integer likesCount;
+//
+//    @Excel(name = "被踩次数")
+//    private Integer opposeCount;
 
    /* @Excel(name = "乐观锁")
     private Integer revision;
@@ -72,4 +76,4 @@ public class EvaluateOfficerExcel {
     private Date updatedTime;*/
 
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java
index 25628a3c3..336b8f732 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java
@@ -128,6 +128,12 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(ActPhraseDTO dto) {
+        String categoryCode = dto.getCode();
+        if (StringUtils.isNotBlank(categoryCode)) {
+            if (getCodeCount(dto) > 0) {
+                throw new RenException("您输入的编码已存在");
+            }
+        }
         ActPhraseEntity entity = ConvertUtils.sourceToTarget(dto, ActPhraseEntity.class);
         updateById(entity);