diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java index 1a122485..b7c52565 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java @@ -207,7 +207,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl { - Map map = null; + Map map = new HashMap<>(); if (StringUtils.isNotBlank(lawsAsmsOpenApi.getQueryParamJson())) { map = (Map) JSON.parse(lawsAsmsOpenApi.getQueryParamJson()); } @@ -573,7 +573,9 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl qw.and(qwi -> qwi.eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS1) .eq("author", loginUser.calcNameWorkNo())) - .or().eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS2)); + .or().eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS2) + .or().eq(roleIds.contains("admin"), "author", "云平台")); // 逻辑删除 queryWrapper.eq("del_flag", 0); // 排序