@ -129,7 +129,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
// 获取根节点
// 获取根节点
RecordSet rs = new RecordSet ( ) ;
RecordSet rs = new RecordSet ( ) ;
rs . executeQuery ( "select id, fname, ftype, fparentid, fnumber, fobjid from jcl_org_map " + whereSql + whereItemSql ) ;
rs . executeQuery ( "select id, fname, ftype, fparentid, fnumber, fobjid , fisvitual from jcl_org_map " + whereSql + whereItemSql ) ;
List < Map < String , Object > > list = new ArrayList < > ( ) ;
List < Map < String , Object > > list = new ArrayList < > ( ) ;
String id = null ;
String id = null ;
if ( rs . next ( ) ) {
if ( rs . next ( ) ) {
@ -142,6 +142,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
item . put ( "fobjid" , rs . getString ( "fobjid" ) ) ;
item . put ( "fobjid" , rs . getString ( "fobjid" ) ) ;
item . put ( "parentId" , null ) ;
item . put ( "parentId" , null ) ;
item . put ( "expand" , "1" ) ;
item . put ( "expand" , "1" ) ;
item . put ( "fisvitual" , rs . getString ( "fisvitual" ) ) ;
item . put ( "hasChildren" , hasChildren ( rs . getString ( "id" ) , true ) ) ;
item . put ( "hasChildren" , hasChildren ( rs . getString ( "id" ) , true ) ) ;
list . add ( item ) ;
list . add ( item ) ;
}
}
@ -158,7 +159,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
}
}
private void findCompanyItemByParantId ( String id , int currentLevel , String level , RecordSet rs , List < Map < String , Object > > list , String whereSql , boolean expand ) {
private void findCompanyItemByParantId ( String id , int currentLevel , String level , RecordSet rs , List < Map < String , Object > > list , String whereSql , boolean expand ) {
String sql = "select id, fname, ftype, fparentid,fobjid,fecid,fnumber from jcl_org_map " + whereSql ;
String sql = "select id, fname, ftype, fparentid,fobjid,fecid,fnumber ,fisvitual from jcl_org_map " + whereSql ;
DetachUtil detachUtil = new DetachUtil ( user . getUID ( ) ) ;
DetachUtil detachUtil = new DetachUtil ( user . getUID ( ) ) ;
if ( detachUtil . isDETACH ( ) & & "0" . equals ( id ) ) {
if ( detachUtil . isDETACH ( ) & & "0" . equals ( id ) ) {
sql + = " and ftype = 1 and fobjid in(" + detachUtil . getJclRoleLevels ( ) + ")" ;
sql + = " and ftype = 1 and fobjid in(" + detachUtil . getJclRoleLevels ( ) + ")" ;
@ -176,6 +177,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
item . put ( "fnumber" , rs . getString ( "fnumber" ) ) ;
item . put ( "fnumber" , rs . getString ( "fnumber" ) ) ;
item . put ( "fobjid" , rs . getString ( "fobjid" ) ) ;
item . put ( "fobjid" , rs . getString ( "fobjid" ) ) ;
item . put ( "fecid" , rs . getString ( "fecid" ) ) ;
item . put ( "fecid" , rs . getString ( "fecid" ) ) ;
item . put ( "fisvitual" , rs . getString ( "fisvitual" ) ) ;
item . put ( "expand" , expand ? "1" : "0" ) ;
item . put ( "expand" , expand ? "1" : "0" ) ;
item . put ( "hasChildren" , hasChildren ( rs . getString ( "id" ) , true ) ) ;
item . put ( "hasChildren" , hasChildren ( rs . getString ( "id" ) , true ) ) ;
currentList . add ( item ) ;
currentList . add ( item ) ;
@ -247,7 +249,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
// 获取根节点
// 获取根节点
RecordSet rs = new RecordSet ( ) ;
RecordSet rs = new RecordSet ( ) ;
rs . executeQuery ( "select t.id, t.fname, t.ftype, t.fparentid, t.fleadername,t.fobjid,t.fecid, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber, t.fleader, t.fleaderlv, t.fleaderst, t.fecid from jcl_org_map t " + whereSql + whereItemSql ) ;
rs . executeQuery ( "select t.id, t.fname, t.ftype, t.fparentid, t.fleadername,t.fobjid,t.fecid, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber, t.fleader, t.fleaderlv, t.fleaderst, t.fecid, t.fisvitual from jcl_org_map t " + whereSql + whereItemSql ) ;
List < Map < String , Object > > list = new ArrayList < > ( ) ;
List < Map < String , Object > > list = new ArrayList < > ( ) ;
String id = null ;
String id = null ;
if ( rs . next ( ) ) {
if ( rs . next ( ) ) {
@ -270,6 +272,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
item . put ( "fleaderlv" , convertLevel ( rs . getString ( "fleaderlv" ) ) ) ;
item . put ( "fleaderlv" , convertLevel ( rs . getString ( "fleaderlv" ) ) ) ;
item . put ( "fleaderst" , convertGrade ( rs . getString ( "fleaderst" ) ) ) ;
item . put ( "fleaderst" , convertGrade ( rs . getString ( "fleaderst" ) ) ) ;
item . put ( "fecid" , rs . getString ( "fecid" ) ) ;
item . put ( "fecid" , rs . getString ( "fecid" ) ) ;
item . put ( "fisvitual" , rs . getString ( "fisvitual" ) ) ;
list . add ( item ) ;
list . add ( item ) ;
}
}
@ -292,7 +295,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
whereSql + = " and fparentid in (" + ids + ") " ;
whereSql + = " and fparentid in (" + ids + ") " ;
RecordSet rs = new RecordSet ( ) ;
RecordSet rs = new RecordSet ( ) ;
rs . executeQuery ( "select t.id, t.fname, t.ftype, t.fparentid, t.fleadername, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber, t.fleader,t.fleaderlv, t.fleaderst,t.fobjid from jcl_org_map t " + whereSql ) ;
rs . executeQuery ( "select t.id, t.fname, t.ftype, t.fparentid, t.fleadername, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber, t.fleader,t.fleaderlv, t.fleaderst,t.fobjid ,t.fisvitual from jcl_org_map t " + whereSql ) ;
List < Map < String , Object > > currentList = new ArrayList < > ( ) ;
List < Map < String , Object > > currentList = new ArrayList < > ( ) ;
while ( rs . next ( ) ) {
while ( rs . next ( ) ) {
Map < String , Object > item = new HashMap < > ( ) ;
Map < String , Object > item = new HashMap < > ( ) ;
@ -311,6 +314,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
item . put ( "fleaderlv" , convertLevel ( rs . getString ( "fleaderlv" ) ) ) ;
item . put ( "fleaderlv" , convertLevel ( rs . getString ( "fleaderlv" ) ) ) ;
item . put ( "fleaderst" , convertGrade ( rs . getString ( "fleaderst" ) ) ) ;
item . put ( "fleaderst" , convertGrade ( rs . getString ( "fleaderst" ) ) ) ;
item . put ( "fobjid" , rs . getString ( "fobjid" ) ) ;
item . put ( "fobjid" , rs . getString ( "fobjid" ) ) ;
item . put ( "fisvitual" , rs . getString ( "fisvitual" ) ) ;
currentList . add ( item ) ;
currentList . add ( item ) ;
}
}
@ -346,7 +350,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
whereSql + = " and fparentid in (" + ids + ") " ;
whereSql + = " and fparentid in (" + ids + ") " ;
RecordSet rs = new RecordSet ( ) ;
RecordSet rs = new RecordSet ( ) ;
rs . executeQuery ( "select id, fname, ftype, fparentid, fnumber,fobjid from jcl_org_map " + whereSql ) ;
rs . executeQuery ( "select id, fname, ftype, fparentid, fnumber,fobjid ,fisvitual from jcl_org_map " + whereSql ) ;
List < Map < String , Object > > currentList = new ArrayList < > ( ) ;
List < Map < String , Object > > currentList = new ArrayList < > ( ) ;
while ( rs . next ( ) ) {
while ( rs . next ( ) ) {
Map < String , Object > item = new HashMap < > ( ) ;
Map < String , Object > item = new HashMap < > ( ) ;
@ -356,6 +360,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
item . put ( "parentId" , rs . getString ( "fparentid" ) ) ;
item . put ( "parentId" , rs . getString ( "fparentid" ) ) ;
item . put ( "fnumber" , rs . getString ( "fnumber" ) ) ;
item . put ( "fnumber" , rs . getString ( "fnumber" ) ) ;
item . put ( "fobjid" , rs . getString ( "fobjid" ) ) ;
item . put ( "fobjid" , rs . getString ( "fobjid" ) ) ;
item . put ( "fisvitual" , rs . getString ( "fisvitual" ) ) ;
item . put ( "hasChildren" , hasChildren ( rs . getString ( "id" ) , true ) ) ;
item . put ( "hasChildren" , hasChildren ( rs . getString ( "id" ) , true ) ) ;
currentList . add ( item ) ;
currentList . add ( item ) ;
}
}
@ -368,7 +373,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
private void findUserItemByParantId ( String id , int currentLevel , String level , RecordSet rs , List < Map < String , Object > > list , String whereSql , boolean expand ) {
private void findUserItemByParantId ( String id , int currentLevel , String level , RecordSet rs , List < Map < String , Object > > list , String whereSql , boolean expand ) {
String sql = "select t.id, t.fname, t.ftype, t.fparentid, t.fobjparentid,t.fleader, t.fleadername, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber,t.fobjid,t.fecid,t.fleaderlv, t.fleaderst from jcl_org_map t " + whereSql ;
String sql = "select t.id, t.fname, t.ftype, t.fparentid, t.fobjparentid, t.fleader, t.fleadername, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber, t.fobjid, t.fecid, t.fleaderlv, t.fleaderst, t.fisvitual from jcl_org_map t " + whereSql ;
DetachUtil detachUtil = new DetachUtil ( user . getUID ( ) ) ;
DetachUtil detachUtil = new DetachUtil ( user . getUID ( ) ) ;
if ( detachUtil . isDETACH ( ) & & "0" . equals ( id ) ) {
if ( detachUtil . isDETACH ( ) & & "0" . equals ( id ) ) {
sql + = " and ftype = 1 and fobjid in(" + detachUtil . getJclRoleLevels ( ) + ")" ;
sql + = " and ftype = 1 and fobjid in(" + detachUtil . getJclRoleLevels ( ) + ")" ;
@ -396,6 +401,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
item . put ( "fleader" , rs . getString ( "fleader" ) ) ;
item . put ( "fleader" , rs . getString ( "fleader" ) ) ;
item . put ( "fleaderlv" , convertLevel ( rs . getString ( "fleaderlv" ) ) ) ;
item . put ( "fleaderlv" , convertLevel ( rs . getString ( "fleaderlv" ) ) ) ;
item . put ( "fleaderst" , convertGrade ( rs . getString ( "fleaderst" ) ) ) ;
item . put ( "fleaderst" , convertGrade ( rs . getString ( "fleaderst" ) ) ) ;
item . put ( "fisvitual" , rs . getString ( "fisvitual" ) ) ;
item . put ( "hasChildren" , hasChildren ( rs . getString ( "id" ) , false ) ) ;
item . put ( "hasChildren" , hasChildren ( rs . getString ( "id" ) , false ) ) ;
currentList . add ( item ) ;
currentList . add ( item ) ;
}
}