Merge branch 'dev' into pre-production

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicNoticeController.java

@@ -32,6 +32,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.annotation.PreAuth;
 import org.springblade.core.secure.constant.AuthConstant;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.annotation.TenantDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -79,6 +80,11 @@ public class BasicNoticeController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入notice")
 	public R<IPage<BasicNoticeVO>> list(@ApiIgnore @RequestParam Map<String, Object> notice, Query query) {
 		BasicNoticeWrapper.build().noticeQuery(notice);
+
+		if(AuthUtil.isAdmin()){
+			return R.data(null);
+		}
+
 		IPage<BasicNotice> pages = noticeService.page(Condition.getPage(query), Condition.getQueryWrapper(notice, BasicNotice.class));
 		return R.data(BasicNoticeWrapper.build().pageVO(pages));
 	}