提交代码

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -94,7 +94,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.ForumId,
                 x.ForumName,
                 x.ForumIcon,
-                Deadline = x.IsOpenEnroll == 1 ? x.Deadline.Value.ToString("yyyy-MM-dd HH:mm") :"",
+                Deadline = x.IsOpenEnroll == 1 ? x.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "",
                 CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
             });
             return ApiResult.Success("", pagelist);
@@ -675,35 +675,32 @@ namespace Mall.WebApi.Controllers.MallBase
 
             int MyFollowId = 0;
             int OtherFollowId = 0;
-            if (userId == 0)
-            {
-                userId = userInfo.UserId;
-            }
-           
+
             var oldList = miaiModule.GetFollowMemberList(new RB_MiAi_FollowMember_Extend { Status = 0, UserId = userId, CreateBy = userInfo.UserId, MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId });
             var oldOtherList = miaiModule.GetFollowMemberList(new RB_MiAi_FollowMember_Extend { Status = 0, UserId = userInfo.UserId, CreateBy = userId, MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId });
-            if (oldList != null && oldList.Any() && oldOtherList != null && oldOtherList.Any())
+            if (userId != userInfo.UserId)
             {
-                isFollow = 3;
-                MyFollowId = oldList.FirstOrDefault()?.ID ?? 0;
-                OtherFollowId = oldOtherList.FirstOrDefault()?.ID ?? 0;
-            }
-            else if (oldList != null && oldList.Any())
-            {
-                isFollow = 1;
-                MyFollowId = oldList.FirstOrDefault()?.ID ?? 0;
-            }
-            else if (oldOtherList != null && oldOtherList.Any())
-            {
-                isFollow = 2;
-                OtherFollowId = oldOtherList.FirstOrDefault()?.ID ?? 0;
-            }
-            else
-            {
-                isFollow = 0;
+                if (oldList != null && oldList.Any() && oldOtherList != null && oldOtherList.Any())
+                {
+                    isFollow = 3;
+                    MyFollowId = oldList.FirstOrDefault()?.ID ?? 0;
+                    OtherFollowId = oldOtherList.FirstOrDefault()?.ID ?? 0;
+                }
+                else if (oldList != null && oldList.Any())
+                {
+                    isFollow = 1;
+                    MyFollowId = oldList.FirstOrDefault()?.ID ?? 0;
+                }
+                else if (oldOtherList != null && oldOtherList.Any())
+                {
+                    isFollow = 2;
+                    OtherFollowId = oldOtherList.FirstOrDefault()?.ID ?? 0;
+                }
+                else
+                {
+                    isFollow = 0;
+                }
             }
-
-
             var oldUserInfo = miaiModule.GetMemberUserInfo(userId);
             var oldBaseInfo = miaiModule.GetBaseInfoList(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();