Merge pull request '组织架构图，不展示手机、地址、部门' (#40) from feature/dxf into develop

Reviewed-on: #40

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

@@ -322,23 +322,20 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             currentList.add(item);
         }
 
-        for (Map<String, Object> stringObjectMap : currentList) {
+        //for (Map<String, Object> stringObjectMap : currentList) {
-            if ("4".equals(stringObjectMap.get("ftype"))) { // 员工信息
+        //    if ("4".equals(stringObjectMap.get("ftype"))) { // 员工信息
-                rs.executeQuery("select id, mobile, homeaddress from hrmresource where id = ? ", stringObjectMap.get("fnumber"));
+        //        rs.executeQuery("select id, mobile, home_address from jcl_org_hrmresource where id = ? ", stringObjectMap.get("fobjid"));
-                if (rs.next()) {
+        //        if (rs.next()) {
-                    stringObjectMap.put("mobile", rs.getString("mobile"));
+        //            stringObjectMap.put("mobile", rs.getString("mobile"));
-                    stringObjectMap.put("address", rs.getString("homeaddress"));
+        //            stringObjectMap.put("address", rs.getString("home_address"));
-                }
+        //        }
-                rs.executeQuery("select departmentname from hrmresource hrm \n" +
+        //        rs.executeQuery("select dept_name from jcl_org_hrmresource hrm left join jcl_org_dept d on hrm.department_id = d.id where hrm.id =? ", stringObjectMap.get("fobjid"));
-                        "left join hrmdepartment d\n" +
+        //        if (rs.next()) {
-                        "on hrm.departmentid = d.id\n" +
+        //            stringObjectMap.put("department", rs.getString("dept_name"));
-                        "where hrm.id = ? ", stringObjectMap.get("fnumber"));
+        //        }
-                if (rs.next()) {
+        //
-                    stringObjectMap.put("department", rs.getString("departmentname"));
+        //    }
-                }
+        //}
-
-            }
-        }
 
         Map<String, Object> result = new HashMap<>();
         result.put("api_status", true);