From a5c9222770c89c30b5d0b78d061e99765f38458a Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 27 May 2022 17:37:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=89=80=E5=B1=9E=E6=94=AF?=
 =?UTF-8?q?=E9=83=A8=E4=B8=A4=E8=BE=B9=E5=AD=98=E5=82=A8=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcPartyMemberServiceImpl.java        |  5 +++-
 .../service/impl/IcResiUserServiceImpl.java   | 23 ++++++++-----------
 .../impl/IcVolunteerPolyServiceImpl.java      |  3 +++
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
index 8b10f6308d..ef8e0eb205 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
@@ -334,8 +334,11 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
 
         //查询党组织信息
         if (StringUtils.isNotBlank(dto.getSszb())) {
+            List<String> orgIdList = Arrays.asList(dto.getSszb().split(StrConstant.COMMA));
+            String sszb = orgIdList.get(orgIdList.size() - 1);
+            dto.setSszb(sszb);
             //获取党组织信息
-            IcPartyOrgEntity org = icPartyOrgService.selectById(dto.getSszb());
+            IcPartyOrgEntity org = icPartyOrgService.selectById(sszb);
             dto.setAgencyId(org.getAgencyId());
             dto.setAgencyPids(org.getAgencyPids());
             dto.setOrgPids(org.getOrgPids());
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index e443b43e01..644e649eb0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -2107,19 +2107,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             user.setUpdatedTime(null);
             baseDao.updateById(user);
 
-            //判断是否有党员信息，没有则新增一条，有的话就更新
-            LambdaQueryWrapper<IcPartyMemberEntity> partyWrapper = new LambdaQueryWrapper<>();
-            partyWrapper.eq(IcPartyMemberEntity::getIcResiUser, formDTO.getIcResiUser());
-            IcPartyMemberEntity partyMember = icPartyMemberDao.selectOne(partyWrapper);
-            if (null == partyMember) {
-                partyMember = ConvertUtils.sourceToTarget(formDTO, IcPartyMemberEntity.class);
-                icPartyMemberDao.insert(partyMember);
-            } else {
-                IcPartyMemberEntity partyMemberEntity = ConvertUtils.sourceToTarget(formDTO, IcPartyMemberEntity.class);
-                partyMemberEntity.setId(partyMember.getId());
-                icPartyMemberDao.updateById(partyMemberEntity);
-            }
-
         } else {
             //获取居民信息
             LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
@@ -2148,11 +2135,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
 
         //判断是否有党员信息，没有则新增一条，有的话就更新
+        String branch = formDTO.getOrgPids();
+        if (StringUtils.isNotBlank(branch)) {
+            branch = branch.replace(StrConstant.COLON, StrConstant.COMMA);
+        } else {
+            branch = "";
+        }
+        formDTO.setSszb(branch.concat(formDTO.getSszb()));
         LambdaQueryWrapper<IcPartyMemberEntity> partyWrapper = new LambdaQueryWrapper<>();
-        partyWrapper.eq(IcPartyMemberEntity::getIcResiUser, dto.getIcResiUser());
+        partyWrapper.eq(IcPartyMemberEntity::getIcResiUser, formDTO.getIcResiUser());
         IcPartyMemberEntity partyMember = icPartyMemberDao.selectOne(partyWrapper);
         if (null == partyMember) {
             partyMember = ConvertUtils.sourceToTarget(formDTO, IcPartyMemberEntity.class);
+
             icPartyMemberDao.insert(partyMember);
         } else {
             IcPartyMemberEntity partyMemberEntity = ConvertUtils.sourceToTarget(formDTO, IcPartyMemberEntity.class);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java
index 845e97f719..a78b01543d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java
@@ -340,6 +340,9 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
                     }
                     List<String> categoryList = Arrays.asList(volunteerList.get(NumConstant.ZERO).getVolunteerCategory().split(StrConstant.COMMA));
                     if (isDyzxh) {
+                        if (CollectionUtils.isEmpty(categoryList)) {
+                            categoryList = new ArrayList<>();
+                        }
                         categoryList.add("dangyuanzhongxinhu");
                     }
                     List<IcVolunteerPolyCategoryEntity> entityList = categoryList.stream().map(o -> {