会员管理修改信息

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());
+        if (wxUserMemberReq.getProvinceId() != null) {
-        wxUserMember.setProvince(province.getName());
+            SysRegion province = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getProvinceId());
-        SysRegion city = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getCityId());
+            wxUserMember.setProvince(province.getName());
-        wxUserMember.setCity(city.getName());
+        }
-        SysRegion area = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getAreaId());
+        if (wxUserMemberReq.getCityId() != null) {
-        wxUserMember.setArea(area.getName());
+            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);
     }