Merge branch 'develop' into release_temp

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);

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());

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

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);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -173,7 +173,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     dto.setIdCard(map.get("ID_CARD"));
                     IcResiUserDTO userDTO = baseDao.getResiUser(dto);
                     if (null != userDTO && null != userDTO.getIdCard()) {
-                        throw new RenException("新增居民信息失败，身份证号已存在!");
+                        throw new RenException(9999, "新增居民信息失败，身份证号已存在!");
                     }
                 }
                 //2021.11.25  end
@@ -231,7 +231,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     dto.setIdCard(map.get("ID_CARD"));
                     IcResiUserDTO userDTO = baseDao.getResiUser(dto);
                     if (null != userDTO && null != userDTO.getIdCard()) {
-                        throw new RenException("修改居民信息失败，身份证号已存在!");
+                        throw new RenException(9999, "修改居民信息失败，身份证号已存在!");
                     }
                 }
                 //2021.11.25  end