Merge remote-tracking branch 'origin/develop_3' into develop_3

# Conflicts: # adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
2021-07-26 20:12:12 +08:00
parent 9cd93436c4 7e50bf88b0
commit f4c7b2ba68
74 changed files with 1992 additions and 344 deletions
@@ -147,6 +147,7 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
            tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide());
        }
        tsResourceQueryWrapper.isNull("PARENT_ID");
+        tsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
        List<TsResource> TsResources=dao.selectList(tsResourceQueryWrapper);
        for(TsResource TsResource:TsResources){
            TsResource.setChildren(recursionGetChildren((TsResource)));