BUG修复

src/com/engine/organization/service/impl/DepartmentServiceImpl.java

@@ -426,7 +426,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
     public List<SearchConditionGroup> getMergeForm(Long id) {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> condition = new ArrayList<>();
-        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并部门", "161", "department", "deptBrowser");
+        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并到部门", "161", "department", "deptBrowser");
         deptBrowserItem.setRules("required|string");
         SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "合并后名称", "mergeName");
         mergeNameItem.setRules("required|string");
@@ -464,7 +464,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
     public List<SearchConditionGroup> getMoveForm() {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> condition = new ArrayList<>();
-        SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "请选择部门", "161", "company", "compBrowser");
+        SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "请选择公司/分部", "161", "company", "compBrowser");
         compBrowserItem.setRules("required|string");
         SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "请选择部门", "161", "department", "deptBrowser");
         deptBrowserItem.setRules("required|string");