fetch:数据处理

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java

@@ -42,4 +42,7 @@ public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
      */
     @Select("select * from ts_institution where parent_id not in (select id from ts_institution)")
     List<TsInstitution> selectRoot();
+
+    @Select("select * from ts_institution order by rand() limit 1")
+    TsInstitution selectRand();
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java

@@ -110,6 +110,9 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
             tsInstitution.setDisabled(true);
             tsInstitution.setChildren(recursionGetInstitutionAndUser(tsInstitution));
             for(TsUserVO user:tsInstitution.getUsers()){
+                if(tsInstitution.getChildren()==null){
+                    tsInstitution.setChildren(new ArrayList<>());
+                }
                 tsInstitution.getChildren().add(user);
             }
         }
@@ -149,6 +152,10 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
             tsInstitutionNode.setChildren(recursionGetInstitutionAndUser(tsInstitutionNode));
             institutionObject.add(tsInstitutionNode);
             for(TsUserVO user:tsInstitutionNode.getUsers()){
+                if(tsInstitutionNode.getChildren()==null){
+                    tsInstitutionNode.setChildren(new ArrayList<>());
+                }
+
                 tsInstitutionNode.getChildren().add(user);
             }
         }