Merge branch 'fix/some_bug_from_qh' into 'develop'

Fix/修复会议申请bug和通讯录查询的bug

See merge request o2oa/o2oa!447

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/meeting/apply/MeetingApplyActivity.kt

@@ -16,6 +16,7 @@ import com.borax12.materialdaterangepicker.time.RadialPickerLayout
 import com.borax12.materialdaterangepicker.time.TimePickerDialog
 import kotlinx.android.synthetic.main.content_meeting_create_form.*
 import net.muliba.fancyfilepickerlibrary.FilePicker
+import net.zoneland.x.bpm.mobile.v1.zoneXBPM.O2SDKManager
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.R
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.app.base.BaseMVPActivity
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.app.meeting.room.MeetingRoomChooseActivity
@@ -204,6 +205,7 @@ class MeetingApplyActivity : BaseMVPActivity<MeetingApplyContract.View, MeetingA
                 savePersonList.remove(invitePersonAdd)
                 info.invitePersonList = savePersonList
                 info.room = roomId
+                info.applicant = O2SDKManager.instance().distinguishedName
                 if (TextUtils.isEmpty(meetingId)) {
                     mPresenter.saveMeetingNoFile(info)
                 } else {

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/organization/NewOrganizationActivity.kt

@@ -122,11 +122,12 @@ class NewOrganizationActivity : BaseMVPActivity<NewOrganizationContract.View, Ne
             }
 
             override fun clickDepartment(department: NewContactListVO.Department) {
-                XLog.debug("click department ${department.name}")
+                XLog.debug("click department ${department.name} ， ${department.id},  ${department.distinguishedName}")
                 val totalChild = department.identityCount + department.departmentCount
                 if (totalChild > 0) {
                     val newLevel = orgLevel + 1
-                    val bean = ContactBreadcrumbBean(department.id, department.name, newLevel)
+                    val deptId = if(TextUtils.isEmpty(department.id)){department.distinguishedName}else{department.id}
+                    val bean = ContactBreadcrumbBean(deptId, department.name, newLevel)
                     breadcrumbBeans.add(bean)
                     refreshOrganizationMain()
                 }

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/core/component/enums/HotPictureApplicationEnum.java

@@ -7,7 +7,7 @@ package net.zoneland.x.bpm.mobile.v1.zoneXBPM.core.component.enums;
 public enum HotPictureApplicationEnum {
 
     BBS("BBS", "论坛"),
-    CMS("CMS", "内容管理");
+    CMS("CMS", "信息中心");
 
     private final String key;
     private final String name;

o2android/app/src/main/res/values/strings.xml

@@ -633,7 +633,7 @@
     </string-array>
 
     <!-- cms -->
-    <string name="cms">内容管理</string>
+    <string name="cms">信息中心</string>
     <string name="cms_create">新建</string>
     <string name="title_cms_view">查看文章</string>
     <string name="title_cms_application">栏目</string>