Bläddra i källkod

客户端查看系统模版

chenr 2 månader sedan
förälder
incheckning
8a52606a1a

+ 6 - 4
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -816,8 +816,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                                 }else {
                                     try {
                                         if(lazyNodeVO.getIsTypePrivatePid()!=null){
-                                            String privateSql="select ancestors_p_id from m_wbs_tree_private where p_key_id="+lazyNodeVO.getIsTypePrivatePid()+" and is_deleted=0";
-                                            String ancestorsPId = jdbcTemplate.queryForObject(privateSql,new SingleColumnRowMapper<>(String.class));
+                                            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 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){
@@ -951,8 +952,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                                         }else {
                                             try {
                                                 if(lazyNodeVO.getIsTypePrivatePid()!=null){
-                                                    String privateSql="select ancestors_p_id from m_wbs_tree_private where p_key_id="+lazyNodeVO.getIsTypePrivatePid()+" and is_deleted=0";
-                                                    String ancestorsPId = jdbcTemplate.queryForObject(privateSql,new SingleColumnRowMapper<>(String.class));
+                                                    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 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){