!46 部门BUG修复

Merge pull request !46 from dxfeng/feature/dxf

src/com/engine/organization/entity/department/bo/DepartmentBO.java

@@ -82,8 +82,8 @@ public class DepartmentBO {
                 .deptNo(param.getDeptNo())
                 .deptName(param.getDepartmentName())
                 .deptNameShort(param.getDeptNameShort())
-                .parentComp(param.getParentComp())
-                .parentDept(param.getParentDept())
+                .parentComp(null==param.getParentComp()?param.getSubcompanyid1():param.getParentComp())
+                .parentDept(null==param.getParentDept()?param.getDepartmentid():param.getParentDept())
                 .deptPrincipal(param.getDeptPrincipal())
                 .showOrder(param.getShowOrder())
                 .forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1)

src/com/engine/organization/entity/department/dto/DepartmentListDTO.java

@@ -82,11 +82,11 @@ public class DepartmentListDTO {
     @TableTitle(title = "显示顺序", dataIndex = "showOrder", key = "showOrder")
     private int showOrder;
 
-    /**
-     * 说明
-     */
-    @TableTitle(title = "说明", dataIndex = "description", key = "description")
-    private String description;
+    ///**
+    // * 说明
+    // */
+    //@TableTitle(title = "说明", dataIndex = "description", key = "description")
+    //private String description;
 
     /**
      * 禁用标记

src/com/engine/organization/entity/department/param/DeptSearchParam.java

@@ -36,4 +36,8 @@ public class DeptSearchParam extends BaseQueryParam {
     private String description;
 
     private Boolean forbiddenTag;
+
+    private Long subcompanyid1;
+
+    private Long departmentid;
 }

src/com/engine/organization/service/DepartmentService.java

@@ -1,5 +1,6 @@
 package com.engine.organization.service;
 
+import com.api.browser.bean.SearchConditionGroup;
 import com.engine.organization.entity.department.param.DeptSearchParam;
 import com.engine.organization.entity.department.param.QuerySingleDeptListParam;
 import com.engine.organization.entity.department.vo.SingleDeptTreeVO;
@@ -7,6 +8,7 @@ import com.engine.organization.entity.searchtree.SearchTreeParams;
 import com.engine.organization.util.page.PageInfo;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -104,4 +106,11 @@ public interface DepartmentService {
      */
     Map<String, Object> getSaveForm();
 
+    /**
+     * 复制表单
+     *
+     * @return
+     */
+    List<SearchConditionGroup> getCopyForm();
+
 }

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

@@ -266,9 +266,13 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         topMenuList.add(MenuBtn.topMenu_addNew());
         // 批量删除
         topMenuList.add(MenuBtn.topMenu_batchDelete());
+        // 复制
+        topMenuList.add(MenuBtn.topMenu_copy());
         btnDatas.put("topMenu", topMenuList);
         // 新增
         rightMenuList.add(MenuBtn.rightMenu_addNew());
+        // 复制
+        rightMenuList.add(MenuBtn.rightMenu_copy());
         // 日志
         rightMenuList.add(MenuBtn.rightMenu_btnLog());
         btnDatas.put("rightMenu", rightMenuList);
@@ -327,11 +331,11 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         // 所属分部
         SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "161", "parentComp", "compBrowser");
         //上级部门
-        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级公司", "161", "parentDept", "deptBrowser");
+        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级部门", "161", "parentDept", "deptBrowser");
         // 部门负责人
         SearchConditionItem deptPrincipalItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门负责人", "1", "deptPrincipal", "");
         // 显示顺序
-        SearchConditionItem showOrderItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "编号", "showOrder");
+        SearchConditionItem showOrderItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "显示顺序", "showOrder");
         // 说明
         SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "说明", "description");
 
@@ -351,6 +355,26 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         return apiDatas;
     }
 
+    /**
+     * 复制表单
+     *
+     * @return
+     */
+    @Override
+    public List<SearchConditionGroup> getCopyForm() {
+        List<SearchConditionGroup> addGroups = new ArrayList<>();
+        List<SearchConditionItem> condition = new ArrayList<>();
+        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "复制到", "161", "department", "deptBrowser");
+        deptBrowserItem.setRules("required|string");
+        List<SearchConditionOption> selectOptions = new ArrayList<>();
+        SearchConditionItem isCheckItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 15, false, "是否复制岗位信息", "copyJob");
+        isCheckItem.setDetailtype(2);
+        condition.add(deptBrowserItem);
+        condition.add(isCheckItem);
+        addGroups.add(new SearchConditionGroup("", true, condition));
+        return addGroups;
+    }
+
     /**
      * 是否为搜索查询
      *