党员所属支部两边存储格式修改

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

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

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