1

gx_api/GxPress/Api/GxPress.Api/AppControllers/AppMeetingController.cs

@@ -120,7 +120,10 @@ namespace GxPress.Api.AppControllers
                     TimeKey = item.Date.ToString(),
                 };
                 foreach (var data in orderList.Where(n => n.Date == Convert.ToInt32(item.Date)).Distinct().ToList())
-                    timeDictionary.TimeValues.Add(new TimeValue { Key = data.Hour, Value = data.UserName });
+                {
+                    timeDictionary.TimeValues.Add(data.Hour);
+                    timeDictionary.NewTimeValues.Add(new TimeValue { Key = data.Hour, Value = data.UserName });
+                }
                 orderLists.Add(timeDictionary);
             }
             // foreach (var item in orderLists)
@@ -561,7 +564,7 @@ namespace GxPress.Api.AppControllers
                     var meetingTime = meetingTimeList.FirstOrDefault();
                     var TimeValuelast = meetingTime.TimeValues.Last();
                     var data = meetingTime.TimeKey.ToString().Insert(4, "-").Insert(7, "-");
-                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast.Key);
+                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast);
                     if (key < DateTime.Now)
                         status = 1;
                 }
@@ -628,7 +631,7 @@ namespace GxPress.Api.AppControllers
                     var meetingTime = meetingTimeList.FirstOrDefault();
                     var TimeValuelast = meetingTime.TimeValues.Last();
                     var data = meetingTime.TimeKey.ToString().Insert(4, "-").Insert(7, "-");
-                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast.Key);
+                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast);
                     if (key < DateTime.Now)
                         status = 1;
                 }
@@ -695,7 +698,10 @@ namespace GxPress.Api.AppControllers
                 var timeDictionary = new TimeDictionary();
                 timeDictionary.TimeKey = item.Date.ToString();
                 foreach (var date in orderAllList.Where(n => n.Date == item.Date).OrderBy(n => n.Hour).Select(n => n.Hour).Distinct().ToList())
-                    timeDictionary.TimeValues.Add(new TimeValue { Key = date, Value = item.UserName });
+                {
+                    timeDictionary.TimeValues.Add(date);
+                    timeDictionary.NewTimeValues.Add(new TimeValue { Key = date, Value = item.UserName });
+                }
                 orderLists.Add(timeDictionary);
             }
             #endregion

gx_api/GxPress/Api/GxPress.Api/WebControllers/WebMeetingController.cs

@@ -123,7 +123,8 @@ namespace GxPress.Api.WebControllers
                 timeDictionary.TimeKey = item.ToString();
                 foreach (var date in orderList.Where(n => n.Date == item.Date).OrderBy(n => n.Hour).Select(n => n.Hour).Distinct().ToList())
                 {
-                    timeDictionary.TimeValues.Add(new TimeValue { Key = date, Value = item.UserName });
+                    timeDictionary.TimeValues.Add(date);
+                    timeDictionary.NewTimeValues.Add(new TimeValue { Key = date, Value = item.UserName });
                 }
                 orderLists.Add(timeDictionary);
             }
@@ -563,7 +564,7 @@ namespace GxPress.Api.WebControllers
                     var meetingTime = meetingTimeList.FirstOrDefault();
                     var TimeValuelast = meetingTime.TimeValues.Last();
                     var data = meetingTime.TimeKey.ToString().Insert(4, "-").Insert(7, "-");
-                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast.Key);
+                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast);
                     if (key < DateTime.Now)
                         status = 1;
                 }
@@ -630,7 +631,7 @@ namespace GxPress.Api.WebControllers
                     var meetingTime = meetingTimeList.FirstOrDefault();
                     var TimeValuelast = meetingTime.TimeValues.Last();
                     var data = meetingTime.TimeKey.ToString().Insert(4, "-").Insert(7, "-");
-                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast.Key);
+                    var key = Convert.ToDateTime(data).AddHours(TimeValuelast);
                     if (key < DateTime.Now)
                         status = 1;
                 }
@@ -695,7 +696,10 @@ namespace GxPress.Api.WebControllers
                 var timeDictionary = new TimeDictionary();
                 timeDictionary.TimeKey = item.Date.ToString();
                 foreach (var date in orderAllList.Where(n => n.Date == item.Date).OrderBy(n => n.Hour).Select(n => n.Hour).Distinct().ToList())
-                    timeDictionary.TimeValues.Add(new TimeValue { Key = date, Value = item.UserName });
+                {
+                    timeDictionary.TimeValues.Add(date);
+                    timeDictionary.NewTimeValues.Add(new TimeValue { Key = date, Value = item.UserName });
+                }
                 orderLists.Add(timeDictionary);
             }
             #endregion

gx_api/GxPress/Model/GxPress.Request/App/WorkMeeting/MeetingRoomResult.cs

@@ -40,7 +40,8 @@ namespace GxPress.Request.App.WorkMeeting
     {
         public TimeDictionary()
         {
-            TimeValues = new List<TimeValue>();
+            TimeValues = new List<int>();
+            NewTimeValues=new List<TimeValue>();
         }
         /// <summary>
         /// 日期
@@ -51,7 +52,12 @@ namespace GxPress.Request.App.WorkMeeting
         /// 时间
         /// </summary>
         /// <value></value>
-        public List<TimeValue> TimeValues { get; set; }
+        public List<int> TimeValues { get; set; }
+        /// <summary>
+        /// 时间
+        /// </summary>
+        /// <value></value>
+        public List<TimeValue> NewTimeValues { get; set; }
     }
     public class TimeValue
     {

gx_api/GxPress/Service/GxPress.Service.Implement/Group/GroupService.RemoveUser.cs

@@ -63,6 +63,7 @@ namespace GxPress.Service.Implement.Group
                 query.Where(nameof(Entity.Middle.Middle.FolderType), AllTypeConst.Group.GetHashCode());
                 query.Where(nameof(Entity.Middle.Middle.MiddleId), groupId);
                 await _middleRepository.DeleteAsync(query);
+                return true;
             }
             else
             {
@@ -77,10 +78,11 @@ namespace GxPress.Service.Implement.Group
                 query.Where(nameof(Entity.Middle.Middle.MiddleId), groupId);
                 query.Where(nameof(Entity.Middle.Middle.UserId), userId);
                 await _middleRepository.DeleteAsync(query);
+                return true;
             }
-            if (groupUser.GroupUserRoleId == GroupUserRoleTyeConst.SuperAdmin)
-                throw new BusinessException("你的身份是小组创建者，请先转让小组给他人，然后才能退出小组！");
-            return true;
+            // if (groupUser.GroupUserRoleId == GroupUserRoleTyeConst.SuperAdmin)
+            //     throw new BusinessException("你的身份是小组创建者，请先转让小组给他人，然后才能退出小组！");
+            //return true;
         }
 
         /// <summary>

gx_api/GxPress/Service/GxPress.Service.Implement/Meeting/MeetingService.cs

@@ -69,7 +69,10 @@ namespace GxPress.Service.Implement.Meeting
                 timeDictionary.TimeKey = item.Date.ToString();
                 var timeValues = orderList.Where(n => n.Date == item.Date).OrderBy(n => n.Hour).Select(n => n.Hour).Distinct().ToList();
                 foreach (var timeValue in timeValues)
-                    timeDictionary.TimeValues.Add(new TimeValue { Key = timeValue, Value = "" });
+                {
+                    timeDictionary.TimeValues.Add(timeValue);
+                    timeDictionary.NewTimeValues.Add(new TimeValue { Key = timeValue, Value = "" });
+                }
                 orderLists.Add(timeDictionary);
                 //获取相邻的
                 var nearTimeDictionary = GetDictionary(timeValues);

gx_api/GxPress/Service/GxPress.Service.Implement/Topic/TopicService.Add.cs

@@ -1,14 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using System.Transactions;
-using Datory;
 using GxPress.Common.Exceptions;
 using GxPress.Common.Tools;
-using GxPress.Entity;
-using GxPress.Entity.Topic;
-using GxPress.Request.App.Note;
 using GxPress.Request.App.Topic;
 using GxPress.Result;
 using Newtonsoft.Json;