Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

src/com/engine/organization/entity/staff/vo/StaffTableVO.java

@@ -26,9 +26,7 @@ import lombok.NoArgsConstructor;
                 @OrganizationTableOperate(text = "编辑"),
                 @OrganizationTableOperate(index = "1", text = "删除"),
                 @OrganizationTableOperate(index = "2", text = "变更")
-        }, tableType = WeaTableType.CHECKBOX,
-        operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatStaffOperates", otherpara = "column:is_used"),
-        checkboxPopedom = @CheckboxPopedom(showmethod = "com.engine.organization.util.ConfigTrans.getCheckBoxPopedom", popedompara = "column:is_used")
+        }, tableType = WeaTableType.CHECKBOX
 
 )
 public class StaffTableVO {

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

@@ -117,7 +117,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
 
         // 获取根节点
         RecordSet rs = new RecordSet();
-        rs.executeQuery("select id, fname, ftype, fparentid, fnumber from jcl_org_map " + whereSql + whereItemSql);
+        rs.executeQuery("select id, fname, ftype, fparentid, fnumber, fobjid from jcl_org_map " + whereSql + whereItemSql);
         List<Map<String, Object>> list = new ArrayList<>();
         String id = null;
         if (rs.next()) {
@@ -127,13 +127,14 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             item.put("fname", rs.getString("fname"));
             item.put("ftype", rs.getString("ftype"));
             item.put("fnumber", rs.getString("fnumber"));
+            item.put("fobjid",rs.getString("fobjid"));
             item.put("parentId", null);
             item.put("expand", "1");
             item.put("hasChildren", hasChildren(rs.getString("id"), true));
             list.add(item);
         }
 
-        int currentLevel = 1;
+        int currentLevel = 0;
         if (currentLevel + 1 <= Integer.parseInt(level)) {
             findCompanyItemByParantId(id, currentLevel + 1, level, rs, list, whereSql, true);
         }
@@ -180,7 +181,6 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
 
         String fclass = (String) request2Map.get("fclass");  // 维度
 
-
         String fisvitual = (String) request2Map.get("fisvitual");  // 是否显示虚拟组织
         if (StringUtils.isBlank(fisvitual)) {
             fisvitual = "0";