From 5dcdd009c9169800aeed9eccd9b6aa7e85a0256d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Mon, 24 Feb 2020 19:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=A1=E6=81=AF=E3=80=82?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E5=AF=BC=E5=85=A5=E3=80=82=E5=A7=93=E5=90=8D?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E5=8E=BB=E9=99=A4=E7=A9=BA?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/impl/AppUserServiceImpl.java  |  5 +++++
 .../epdc/service/impl/PartyMembersServiceImpl.java  | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index 92bf20d64..a9a8fd4dc 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -781,6 +781,11 @@ public class AppUserServiceImpl implements AppUserService {
     public Result<EpdcAppAuthorizationDTO> completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) {
 
         UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class);
+        // 姓名去空格
+        userDto.setRealName(infoDto.getRealName().trim());
+        if (StringUtils.isBlank(infoDto.getIdentityNo())) {
+            userDto.setIdentityNo(infoDto.getIdentityNo().trim());
+        }
         userDto.setDeptId(Long.valueOf(infoDto.getGridId()));
         userDto.setId(tokenDto.getUserId());
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
index ef06350c0..a85d3f475 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
@@ -265,7 +265,18 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
         ImportParams importParams = new ImportParams();
         try {
             List<PartyMembersEntity> partyMembersEntityList = baseDao.selectList(new QueryWrapper<PartyMembersEntity>());
-            List<PartyMembersExcel> partyList = ExcelImportUtil.importExcel(f, PartyMembersExcel.class, importParams);
+            List<PartyMembersExcel> partyExportList = ExcelImportUtil.importExcel(f, PartyMembersExcel.class, importParams);
+            // 去空格
+            List<PartyMembersExcel> partyList =new ArrayList<>();
+            for(PartyMembersExcel partyItem:partyExportList){
+                if(StringUtils.isNotBlank(partyItem.getIdentityNo())){
+                    partyItem.setIdentityNo(partyItem.getIdentityNo().trim());
+                }
+                if(StringUtils.isNotBlank(partyItem.getRealName())){
+                    partyItem.setRealName(partyItem.getRealName().trim());
+                }
+                partyList.add(partyItem);
+            }
             // 校验数据
             List<EpdcPartyErroyResultDTO> epdcPartyErroyResultDtos = this.checkExcel(partyList, partyMembersEntityList);
             if (epdcPartyErroyResultDtos.size() > 0) {