From b5bde443922d4de330e0ce87fef0cf86ad8c7b8a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 05 五月 2022 14:28:53 +0800
Subject: [PATCH] 花城E+防疫修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
index b101ca9..2bb93cc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -89,13 +89,18 @@
      */
     @Override
     public R addPartyBuildingMember(PartyBuildingMemberVO partyBuildingMemberVO) {
-        String idCard = partyBuildingMemberVO.getIdCard();
         List<ComPbMemberDO> comPbMemberDOs = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda()
-            .eq(ComPbMemberDO::getIdCard, idCard).eq(ComPbMemberDO::getAuditResult, 1));
+            .eq(ComPbMemberDO::getPhone, partyBuildingMemberVO.getPhone()).eq(ComPbMemberDO::getAuditResult, 1));
         if (!ObjectUtils.isEmpty(comPbMemberDOs) && comPbMemberDOs.size() > 0) {
             comPbMemberDOs.forEach(comPbMemberDO -> {
                 comPbMemberDAO.deleteById(comPbMemberDO.getId());
             });
+        }
+        //添加党员同步用户小程序头像
+        R r=userService.getSysUserVOByPhone(partyBuildingMemberVO.getPhone());
+        if(R.isOk(r)&&r.getData()!=null){
+            SysUserVO sysUserVO= (SysUserVO) r.getData();
+            partyBuildingMemberVO.setPhotoPath(sysUserVO.getImgUrl());
         }
         ComPbMemberDO comPbMemberDO1 = new ComPbMemberDO();
         BeanUtils.copyProperties(partyBuildingMemberVO, comPbMemberDO1);
@@ -162,6 +167,12 @@
                     if (!comPbMemberDOList.isEmpty()) {
                         comPbMemberDOList.forEach(comPbMember -> {
                             BeanUtils.copyProperties(partyBuildingMemberExcelVO, comPbMember);
+                            //添加党员同步用户小程序头像
+                            R r=userService.getSysUserVOByPhone(comPbMember.getPhone());
+                            if(R.isOk(r)&&r.getData()!=null){
+                                SysUserVO sysUserVO= (SysUserVO) r.getData();
+                                comPbMember.setPhotoPath(sysUserVO.getImgUrl());
+                            }
                             this.baseMapper.updateById(comPbMember);
                         });
                         continue;

--
Gitblit v1.7.1