提交代码

Mall.Repository/Miai/RB_MiAi_BaseInfoRepository.cs

@@ -37,6 +37,10 @@ namespace Mall.Repository.Miai
                 {
                     sb.AppendFormat(" and Id={0}", where.Id);
                 }
+                if (where.UserId > 0)
+                {
+                    sb.AppendFormat(" and UserId={0}", where.UserId);
+                }
             }
             return Get<RB_MiAi_BaseInfo_Extend>(sb.ToString()).ToList();
         }

Mall.Repository/Miai/RB_Miai_ActivityEnrollRepository.cs

@@ -38,6 +38,10 @@ namespace Mall.Repository.Miai
             {
                 where += $@" and e.{nameof(RB_Miai_ActivityEnroll_Extend.UserId)} ={dmodel.UserId}";
             }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and e.{nameof(RB_Miai_ActivityEnroll_Extend.Id)} ={dmodel.Id}";
+            }
             string sql = $@"select e.*,u.Name as UserName,u.Photo,b.Sex from RB_Miai_ActivityEnroll e
 left join rb_member_user u on e.UserId = u.Id
 left join rb_miai_baseinfo b on e.UserId =b.UserId

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -452,7 +452,9 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.PeopleNum,
                 x.Remark,
                 x.IsFocus,
-                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
+                x.MyFollowId,
+                x.OtherFollowId
             });
             return ApiResult.Success("", pagelist);
         }
@@ -704,6 +706,9 @@ namespace Mall.WebApi.Controllers.MallBase
                     {
                         oldBaseInfo.AlbumList = JsonConvert.DeserializeObject<List<string>>(oldBaseInfo.Album);
                     }
+                    else {
+                        oldBaseInfo.AlbumList = new List<string>();
+                    }
                     IsAttestation = 1;//已认证
                 }
                 else
@@ -713,18 +718,18 @@ namespace Mall.WebApi.Controllers.MallBase
 
                 var result = new
                 {
-                    oldBaseInfo.Id,
-                    oldBaseInfo.Name,
-                    oldBaseInfo.Photo,
+                    oldUserInfo.Id,
+                    oldUserInfo.Name,
+                    oldUserInfo.Photo,
                     IsAttestation,
                     IsFollow = isFollow,
-                    oldBaseInfo?.Sex,
-                    oldBaseInfo?.IDCardNo,
-                    oldBaseInfo?.RealName,
-                    oldBaseInfo?.IDCard,
-                    oldBaseInfo?.IDCardBack,
+                    Sex = oldBaseInfo?.Sex ?? 0,
+                    IDCardNo = oldBaseInfo?.IDCardNo ?? "",
+                    RealName = oldBaseInfo?.RealName ?? "",
+                    IDCard = oldBaseInfo?.IDCard ?? "",
+                    IDCardBack = oldBaseInfo?.IDCardBack ?? "",
                     SexStr = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? (oldBaseInfo.Sex == 1 ? "男" : "女") : "",
-                    oldBaseInfo.Birthday,
+                    Birthday = oldBaseInfo.Birthday ?? "",
                     Age = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAge(oldBaseInfo.Birthday),//年纪
                     ShenXiao = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetShengXiao(Convert.ToDateTime((oldBaseInfo.Birthday))),//生肖
                     ConoldBaseInfostellation = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAtomFromBirthday(Convert.ToDateTime((oldBaseInfo.Birthday))),//星座