From 61e45ba13d2a5df9af672f3d3808e17d9af9eb2c Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Thu, 11 Jan 2024 17:21:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WxUserMemberServiceImpl.java | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java
index 50f6868..9e14f5c 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java
@@ -148,20 +148,31 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
         WxUserMember wxUserMember = new WxUserMember();
         BeanUtils.copyProperties(wxUserMemberReq, wxUserMember);
         // 补充 省市区信息
-        SysRegion province = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getProvinceId());
-        wxUserMember.setProvince(province.getName());
-        SysRegion city = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getCityId());
-        wxUserMember.setCity(city.getName());
-        SysRegion area = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getAreaId());
-        wxUserMember.setArea(area.getName());
+        if (wxUserMemberReq.getProvinceId() != null) {
+            SysRegion province = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getProvinceId());
+            wxUserMember.setProvince(province.getName());
+        }
+        if (wxUserMemberReq.getCityId() != null) {
+            SysRegion city = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getCityId());
+            wxUserMember.setCity(city.getName());
+        }
+        if (wxUserMemberReq.getAreaId() != null) {
+            SysRegion area = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getAreaId());
+            wxUserMember.setArea(area.getName());
+        }
+
         // 删除用户与标签的关联关系
         wxUserTagMapper.deleteWxUserTagByUserId(wxUserMemberReq.getId());
         // 添加用户与小程序标签关联
         List<Integer> userIdList = new ArrayList<>();
         userIdList.add(wxUserMemberReq.getId().intValue());
-        batchAddMiniProgramTag(wxUserMemberReq.getMiniProgramTags(), userIdList);
+        if (wxUserMemberReq.getMiniProgramTags() != null && wxUserMemberReq.getMiniProgramTags().size() > 0) {
+            batchAddMiniProgramTag(wxUserMemberReq.getMiniProgramTags(), userIdList);
+        }
         // 添加用户与企微标签关联
-        batchAddWecomTag(wxUserMemberReq.getWecomTags(), userIdList);
+        if (wxUserMemberReq.getWecomTags() != null && wxUserMemberReq.getWecomTags().size() > 0) {
+            batchAddWecomTag(wxUserMemberReq.getWecomTags(), userIdList);
+        }
         return wxUserMemberMapper.updateWxUserMember(wxUserMember);
     }