Merge branch 'master' of http://git.zthymaoyi.com/wangchao/businessCard

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardHolderInfoServiceImpl.java

@@ -48,8 +48,8 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService {
         Date now = new Date();
         cardHolderInfo.setGmtCreate(now);
         cardHolderInfo.setGmtUpdate(now);
-        //个人展示的二维码 相互交换
-        if (cardHolderInfo.getCardCommonId() != null) {
+        //对方个人展示的二维码并且当前账号有名片情况 在对方名片夹添加我的名片 实现相互交换
+        if (cardHolderInfo.getCardCommonId() != null&&cardHolderInfo.getMyCardId()!=null) {
             CardHolderInfo cardHolderInfo1 = new CardHolderInfo();
             cardHolderInfo1.setCardId(cardHolderInfo.getMyCardId());
             cardHolderInfo1.setCommonId(cardHolderInfo.getCardCommonId());