FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 国内外标准库

Browse Source
This commit is contained in:
super_liu
2021-07-26 18:30:54 +08:00
parent cb48c13635
commit 5a8cad6e09
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
+1
View File
@@ -145,6 +145,7 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide()); tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide());
} }
tsResourceQueryWrapper.isNull("PARENT_ID"); tsResourceQueryWrapper.isNull("PARENT_ID");
tsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
List<TsResource> TsResources=dao.selectList(tsResourceQueryWrapper); List<TsResource> TsResources=dao.selectList(tsResourceQueryWrapper);
for(TsResource TsResource:TsResources){ for(TsResource TsResource:TsResources){
TsResource.setChildren(recursionGetChildren((TsResource))); TsResource.setChildren(recursionGetChildren((TsResource)));
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+3 -1
View File
@@ -151,7 +151,9 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
page.setAdvanceSearchStr(null); page.setAdvanceSearchStr(null);
} }
} }
page.setUserId(LoginUserUtil.getUserId()); if(page.getUserId() == null || page.getUserId().equals("")){
page.setUserId(LoginUserUtil.getUserId());
}
List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page);
return Result.success(getPageInfo(page.getPager(), rows)); return Result.success(getPageInfo(page.getPager(), rows));
} }