修复关注日历事件不显示的bug

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/calendar/MonthCalendarViewModelFragment.kt

@@ -146,11 +146,11 @@ class MonthCalendarViewModelFragment : CalendarBaseFragment(), OnDateSelectedLis
         rv_fragment_calendar_month_list.adapter = adapter
         adapter.setOnItemClickListener { _, position ->
             val event = list[position]
-            if (checkManageAble(event.manageablePersonList)) {
+//            if (checkManageAble(event.manageablePersonList)) {//关注的日历可以查看
                 if (activity is CalendarMainActivity) {
                     (activity as CalendarMainActivity).editEvent(event)
                 }
-            }
+//            }
         }
         val now = Calendar.getInstance()
         if (!this::selectDay.isInitialized) {

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/calendar/vm/CreateEventViewModel.kt

@@ -136,7 +136,7 @@ class CreateEventViewModel(app: Application) : BaseO2ViewModel(app) {
         if (start == null || end == null) {
             return false
         }
-        return (start.timeInMillis < end.timeInMillis)
+        return (start.timeInMillis <= end.timeInMillis)
     }
 
     /**
@@ -230,7 +230,7 @@ class CreateEventViewModel(app: Application) : BaseO2ViewModel(app) {
                         onError { e, isNetworkError ->
                             XLog.error("update fail, isnet:$isNetworkError", e)
                             isLoading.value = false
-                            val res = FrontendResponse(false, "更新异常")
+                            val res = FrontendResponse(false, "更新异常，${e?.message?:""}")
                             netResponse.value = res
                         }
                     }
@@ -274,7 +274,7 @@ class CreateEventViewModel(app: Application) : BaseO2ViewModel(app) {
                         onError { e, isNetworkError ->
                             XLog.error("update fail, isnet:$isNetworkError", e)
                             isLoading.value = false
-                            val res = FrontendResponse(false, "删除异常")
+                            val res = FrontendResponse(false, "删除异常，${e?.message?:""}")
                             netResponse.value = res
                         }
                     }

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/calendar/vm/MonthCalendarViewModel.kt

@@ -97,7 +97,8 @@ class MonthCalendarViewModel(app: Application) : BaseO2ViewModel(app) {
         val start = DateHelper.getDate(startTime.time)
         val end = DateHelper.getDate(endTime.time)
         val result = HashMap<String, ArrayList<CalendarEventInfoData>>()
-        val filter = CalendarEventFilterInfo(calendarIds, O2SDKManager.instance().distinguishedName, "$start 00:00:00", "$end 23:59:59")
+        //O2SDKManager.instance().distinguishedName
+        val filter = CalendarEventFilterInfo(calendarIds, "", "$start 00:00:00", "$end 23:59:59")
         XLog.info("filter:$filter")
         getCalendarAssembleService()?.let { service ->
             service.filterCalendarEventList(filter)