From c90bc0c426399b74807d618774aa9968755ffa68 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 25 Nov 2021 12:01:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E9=87=8D=E5=A4=8D=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/controller/IcPartyActivityController.java    | 2 ++
 .../main/java/com/epmet/controller/IcPartyUnitController.java   | 2 ++
 .../java/com/epmet/service/impl/IcPartyUnitServiceImpl.java     | 2 +-
 .../partymember/controller/IcPartymemberStyleController.java    | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
index 9da287e05d..5fad4a9c6e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -64,6 +65,7 @@ public class IcPartyActivityController {
     }
 
     @PostMapping("save")
+    @NoRepeatSubmit
     public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActivityDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
index f0b03fa8d9..780b9f141e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -69,6 +70,7 @@ public class IcPartyUnitController {
     }
 
     @PostMapping("save")
+    @NoRepeatSubmit
     public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartyUnitDTO dto){
         //效验数据
         dto.setCustomerId(tokenDto.getCustomerId());
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
index de6fdafb0f..fb8bc02b3f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
@@ -146,7 +146,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         if (StringUtils.isNotBlank(dto.getServiceMatter())) {
             dto.setServiceMatterList(Arrays.asList(dto.getServiceMatter().split(StrConstant.COMMA)));
         }
-        return ConvertUtils.sourceToTarget(entity, IcPartyUnitDTO.class);
+        return dto;
     }
 
     @Override
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
index a5fea4b9da..e3ed99cb53 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
@@ -18,6 +18,7 @@
 package com.epmet.modules.partymember.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -66,6 +67,7 @@ public class IcPartymemberStyleController {
     }
 
     @PostMapping("save")
+    @NoRepeatSubmit
     public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartymemberStyleDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);