提交代码

Mall.WebApi/Controllers/Education/AppletEducationController.cs

@@ -1729,11 +1729,20 @@ namespace Mall.WebApi.Controllers.Education
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-
+        [AllowAnonymous]
         public ApiResult GetActivityPage()
         {
             var req = RequestParm;
             var userInfo = AppletUserInfo;
+            if (userInfo == null)
+            {
+                userInfo = new AppletUserInfo
+                {
+                    UserId = RequestParm.UserId,
+                    MallBaseId = RequestParm.MallBaseId,
+                    TenantId = RequestParm.TenantId
+                };
+            }
             //  var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
             JObject jObj = JObject.Parse(req.msg.ToString());
@@ -1749,13 +1758,18 @@ namespace Mall.WebApi.Controllers.Education
             query.TenantId = userInfo.TenantId;
             query.MallBaseId = userInfo.MallBaseId;
             var list = activityModule.GetActivityPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query, isQuerySignup: true);
-            foreach (var item in list)
+            
+            if (userInfo.UserId > 0)
             {
-                if (item.EducationConsultList != null && item.EducationConsultList.Any())
+                foreach (var item in list)
                 {
-                    item.IsJoinActivity = (item.EducationConsultList.Where(x => x.UserId == userInfo.UserId) != null && item.EducationConsultList.Where(x => x.UserId == userInfo.UserId).Any()) ? 1 : 0;
+                    if (item.EducationConsultList != null && item.EducationConsultList.Any())
+                    {
+                        item.IsJoinActivity = (item.EducationConsultList.Where(x => x.UserId == userInfo.UserId) != null && item.EducationConsultList.Where(x => x.UserId == userInfo.UserId).Any()) ? 1 : 0;
+                    }
                 }
             }
+
             pageModel.count = Convert.ToInt32(rowsCount);
             var result = list.Select(x => new
             {
@@ -1842,10 +1856,20 @@ namespace Mall.WebApi.Controllers.Education
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost]
+        [AllowAnonymous]
         public ApiResult GetActivityDetial()
         {
             var req = RequestParm;
             var userInfo = AppletUserInfo;
+            if (userInfo == null)
+            {
+                userInfo = new AppletUserInfo
+                {
+                    UserId = RequestParm.UserId,
+                    MallBaseId = RequestParm.MallBaseId,
+                    TenantId = RequestParm.TenantId
+                };
+            }
             JObject parm = JObject.Parse(req.msg.ToString());
             int Id = parm.GetInt("Id");
             if (Id == 0)
@@ -1933,7 +1957,7 @@ namespace Mall.WebApi.Controllers.Education
                     model.LocationName,
                     model.LonLat,
                     model.StartAge,
-                    IsJoinActivity = (model.EducationConsultList.Where(x => x.UserId == userInfo.UserId) != null && model.EducationConsultList.Where(x => x.UserId == userInfo.UserId).Any()) ? 1 : 0,
+                    IsJoinActivity = (userInfo.UserId == 0) ? 0 : (model.EducationConsultList.Where(x => x.UserId == userInfo.UserId) != null && model.EducationConsultList.Where(x => x.UserId == userInfo.UserId).Any()) ? 1 : 0,
                     model.Summary,
                     FileGroup = fileGroup,
                     ActivityTitleList = (model.ActivityTitleList != null && model.ActivityTitleList.Any()) ? model.ActivityTitleList : new List<RB_Education_ActivityTitle_Extend>()