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

fix: 修复线上报错的BUG

Browse Source
This commit is contained in:
zyd
2022-07-13 22:51:31 +08:00
parent fb8d1d62ec
commit e2ce4daf7d
6 changed files with 54 additions and 25 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
+6 -2
View File
@@ -268,7 +268,9 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
}
queryWrapper.isNull("PARENT_ID");
queryWrapper.eq("VALID_FLAG","0");
queryWrapper.in(null!=access && !access.isEmpty(),"ID",access);
if(access!=null && !access.isEmpty()){
queryWrapper.in(null!=access && !access.isEmpty(),"ID",access);
}
queryWrapper.orderByAsc("DISPLAY_SEQ");
TsResources=dao.selectList(queryWrapper);
@@ -276,7 +278,9 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
resource.setTreeType("tsr");
QueryWrapper<TsResource> TsResourceQueryWrapper=new QueryWrapper<>();
TsResourceQueryWrapper.like("PARENT_IDS",","+resource.getId()+",");
TsResourceQueryWrapper.in(null!=access,"ID",access);
if(access!=null && !access.isEmpty()){
TsResourceQueryWrapper.in(null!=access && !access.isEmpty(),"ID",access);
}
TsResourceQueryWrapper.eq("VALID_FLAG","0");
TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
List<TsResource> children=dao.selectList(TsResourceQueryWrapper);