|
@@ -818,7 +818,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
|
|
|
if(lazyNodeVO.getIsTypePrivatePid()!=null){
|
|
|
String privateSql="select p_key_id, ancestors_p_id from m_wbs_tree_private where p_key_id="+lazyNodeVO.getIsTypePrivatePid()+" and is_deleted=0";
|
|
|
WbsTreePrivate ancestor = jdbcTemplate.queryForObject(privateSql,new BeanPropertyRowMapper<>(WbsTreePrivate.class));
|
|
|
- String ancestorsPId=ancestor.getAncestorsPId()+ancestor.getAncestors();
|
|
|
+ String ancestorsPId=ancestor.getAncestorsPId()+","+ancestor.getPKeyId();
|
|
|
String privateNodeNameSql="select node_name from m_wbs_tree_private where p_key_id in ("+ancestorsPId+")";
|
|
|
List<String> wbsTreePrivates = jdbcTemplate.query(privateNodeNameSql,new SingleColumnRowMapper<>(String.class));
|
|
|
if(wbsTreePrivates.size()>0){
|
|
@@ -954,7 +954,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
|
|
|
if(lazyNodeVO.getIsTypePrivatePid()!=null){
|
|
|
String privateSql="select p_key_id, ancestors_p_id from m_wbs_tree_private where p_key_id="+lazyNodeVO.getIsTypePrivatePid()+" and is_deleted=0";
|
|
|
WbsTreePrivate ancestor = jdbcTemplate.queryForObject(privateSql,new BeanPropertyRowMapper<>(WbsTreePrivate.class));
|
|
|
- String ancestorsPId=ancestor.getAncestorsPId()+ancestor.getAncestors();
|
|
|
+ String ancestorsPId=ancestor.getAncestorsPId()+","+ancestor.getPKeyId();
|
|
|
String privateNodeNameSql="select node_name from m_wbs_tree_private where p_key_id in ("+ancestorsPId+")";
|
|
|
List<String> wbsTreePrivates = jdbcTemplate.query(privateNodeNameSql,new SingleColumnRowMapper<>(String.class));
|
|
|
if(wbsTreePrivates.size()>0){
|