Merge branch 'dev/2024/0419/update-app' of Harper/feifan-backend-zx-app into master

修改用户的商城链接分享

feifan-framework/feifan-common/src/main/java/cn/newfeifan/mall/framework/common/enums/CategoryEnum.java

@@ -10,7 +10,7 @@ public enum CategoryEnum {
     /**
      * 商城
      */
-    MALL(1, "商城"),
+    MALL(1, "邀请新用户注册"),
 
     /**
      * 店铺

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/sharelink/ShareLinkMapper.java

@@ -28,10 +28,14 @@ public interface ShareLinkMapper extends BaseMapperX<ShareLinkDO> {
     }
 
     default ShareLinkDO selectByCategory(Integer category, Long loginUserId, Long objectId){
-        return selectOne(new LambdaQueryWrapperX<ShareLinkDO>()
+        LambdaQueryWrapperX<ShareLinkDO> wrapper = new LambdaQueryWrapperX<ShareLinkDO>()
                 .eq(ShareLinkDO::getCategory, category)
-                .eq(ShareLinkDO::getCreateUserId, loginUserId)
-                .eq(ShareLinkDO::getObjectId, objectId)
-        );
+                .eq(ShareLinkDO::getCreateUserId, loginUserId);
+        if(objectId == null){
+            wrapper.isNull(ShareLinkDO::getObjectId);
+        }else{
+            wrapper.eq(ShareLinkDO::getObjectId, objectId);
+        }
+        return selectOne(wrapper);
     }
 }