完善信息。党员导入。姓名身份证号去除空格

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

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