@ -85,8 +85,9 @@ public class OrganizationChartServiceImpl extends Service implements Organizatio
String halfId = bb . getPropValue ( "jhsecond" , "halfId" ) ;
String halfId = bb . getPropValue ( "jhsecond" , "halfId" ) ;
String jobId = bb . getPropValue ( "jhsecond" , "jobId" ) ;
String jobId = bb . getPropValue ( "jhsecond" , "jobId" ) ;
//1.获取建模组织架构图数据
//1.获取建模组织架构图数据
rs . executeQuery ( "select a.gwszbm,a.zzjggw,b.zzjgtgw,a.zzjggwsj,a.sfbj,a.gjsx,a.sfycx from uf_zzjgdygx a left join uf_zzjggw b on a.zzjggw = b.id") ;
rs . executeQuery ( "select a.gwszbm,a.zzjggw,b.zzjgtgw,a.zzjggwsj,a.sfbj,a.gjsx,a.sfycx ,a.yccj from uf_zzjgdygx a left join uf_zzjggw b on a.zzjggw = b.id") ;
List < OrganizationChartVo > voList = new ArrayList < > ( ) ;
List < OrganizationChartVo > voList = new ArrayList < > ( ) ;
while ( rs . next ( ) ) {
while ( rs . next ( ) ) {
PersonInfoVo personInfoVo = selectPersonInfo ( Util . null2String ( rs . getString ( "zzjggw" ) ) , jobId ) ;
PersonInfoVo personInfoVo = selectPersonInfo ( Util . null2String ( rs . getString ( "zzjggw" ) ) , jobId ) ;
@ -99,6 +100,7 @@ public class OrganizationChartServiceImpl extends Service implements Organizatio
. pId ( Util . getIntValue ( rs . getString ( "zzjggwsj" ) ) )
. pId ( Util . getIntValue ( rs . getString ( "zzjggwsj" ) ) )
. orderId ( Util . getIntValue ( rs . getString ( "gjsx" ) , 999 ) )
. orderId ( Util . getIntValue ( rs . getString ( "gjsx" ) , 999 ) )
. addLine ( "0" . equals ( Util . null2String ( rs . getString ( "sfycx" ) ) ) ? "true" : "false" )
. addLine ( "0" . equals ( Util . null2String ( rs . getString ( "sfycx" ) ) ) ? "true" : "false" )
. addCount ( Util . null2String ( rs . getString ( "yccj" ) ) )
. type ( "0" . equals ( Util . null2String ( rs . getString ( "sfbj" ) ) ) ? "tag" : "" )
. type ( "0" . equals ( Util . null2String ( rs . getString ( "sfbj" ) ) ) ? "tag" : "" )
. show ( personInfoVo . getLastName ( ) = = null ? 1 : 0 )
. show ( personInfoVo . getLastName ( ) = = null ? 1 : 0 )
. build ( ) ;
. build ( ) ;
@ -111,6 +113,8 @@ public class OrganizationChartServiceImpl extends Service implements Organizatio
. findFirst ( )
. findFirst ( )
. orElse ( null ) ;
. orElse ( null ) ;
//3.设置半节点存在下级属性值并获取下级
//3.设置半节点存在下级属性值并获取下级
voList . stream ( )
voList . stream ( )
. filter ( vo - > vo . getId ( ) = = Integer . parseInt ( halfId ) )
. filter ( vo - > vo . getId ( ) = = Integer . parseInt ( halfId ) )