fix: 通知管理只查询当前用户创建的

@@ -34,68 +34,66 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 public class YtNoticeController extends BaseController {
 public class YtNoticeController extends BaseController {
 
 
-  private final SysNoticeService sysNoticeService;
+    private final SysNoticeService sysNoticeService;
 
 
-  @GetMapping(
-      path = "page",
-      params = {PAGE_SIZE, PAGE})
-  @ApiOperation("分页")
-  public YtPageData<SysNoticeDTO> page(
-      @RequestParam(value = "type", required = false) SysNoticeTypeEnum type,
-      @RequestParam(PAGE_SIZE) int pageSize,
-      @RequestParam(PAGE) int page,
-      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
-      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
-      throws ThingsboardException {
-    Map<String, Object> queryMap = new HashMap<>();
-    queryMap.put(PAGE_SIZE, pageSize);
-    queryMap.put(PAGE, page);
-    queryMap.put(ORDER_FILED, orderBy);
-    queryMap.put("tenantId", getCurrentUser().getCurrentTenantId());
-    if (orderType != null) {
-      queryMap.put(ORDER_TYPE, orderType.name());
+    @GetMapping(
+            path = "page",
+            params = {PAGE_SIZE, PAGE})
+    @ApiOperation("分页")
+    public YtPageData<SysNoticeDTO> page(
+            @RequestParam(value = "type", required = false) SysNoticeTypeEnum type,
+            @RequestParam(PAGE_SIZE) int pageSize,
+            @RequestParam(PAGE) int page,
+            @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+            @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+            throws ThingsboardException {
+        Map<String, Object> queryMap = new HashMap<>();
+        queryMap.put(PAGE_SIZE, pageSize);
+        queryMap.put(PAGE, page);
+        queryMap.put(ORDER_FILED, orderBy);
+        queryMap.put("tenantId", getCurrentUser().getCurrentTenantId());
+        if (orderType != null) {
+            queryMap.put(ORDER_TYPE, orderType.name());
+        }
+        // 通知类型
+        if (type != null) {
+            queryMap.put("type", type.name());
+        }
+        queryMap.put("creator", getCurrentUser().getCurrentUserId());
+        return sysNoticeService.page(queryMap);
     }
     }
-    // 通知类型
-    if (type != null) {
-      queryMap.put("type", type.name());
-    }
-    if (getCurrentUser().isCustomerUser()){
-      //当前用户
-      queryMap.put("creator",getCurrentUser().getCurrentUserId());
-    } return sysNoticeService.page(queryMap);
-  }
 
 
-  @GetMapping("{id}")
-  @ApiOperation("详情")
-  public ResponseEntity<SysNoticeDTO> get(@PathVariable("id") String id)
-      throws ThingsboardException {
-    return ResponseEntity.ok(sysNoticeService.get(id, getCurrentUser().getCurrentTenantId()));
-  }
+    @GetMapping("{id}")
+    @ApiOperation("详情")
+    public ResponseEntity<SysNoticeDTO> get(@PathVariable("id") String id)
+            throws ThingsboardException {
+        return ResponseEntity.ok(sysNoticeService.get(id, getCurrentUser().getCurrentTenantId()));
+    }
 
 
-  @DeleteMapping("delete")
-  @ApiOperation("批量删除")
-  public void delete(@Validated({DeleteGroup.class})@RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
-     sysNoticeService.delete(deleteDTO.getIds(), getCurrentUser().getCurrentTenantId());
-  }
+    @DeleteMapping("delete")
+    @ApiOperation("批量删除")
+    public void delete(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
+        sysNoticeService.delete(deleteDTO.getIds(), getCurrentUser().getCurrentTenantId());
+    }
 
 
-  @PostMapping("save")
-  @ApiOperation("保存草稿")
-  public ResponseEntity<SysNoticeDTO> save(@Validated(AddGroup.class)@RequestBody SysNoticeDTO sysNoticeDTO) throws ThingsboardException {
-    sysNoticeDTO.setStatus(FastIotConstants.DraftStatus.DRAFT);
-    SysNoticeDTO newSysNoticeDTO =
-        sysNoticeService.save(sysNoticeDTO, getCurrentUser().getCurrentTenantId());
-    return newSysNoticeDTO == null ? ResponseEntity.badRequest().build() : ResponseEntity.ok().build();
-  }
+    @PostMapping("save")
+    @ApiOperation("保存草稿")
+    public ResponseEntity<SysNoticeDTO> save(@Validated(AddGroup.class) @RequestBody SysNoticeDTO sysNoticeDTO) throws ThingsboardException {
+        sysNoticeDTO.setStatus(FastIotConstants.DraftStatus.DRAFT);
+        SysNoticeDTO newSysNoticeDTO =
+                sysNoticeService.save(sysNoticeDTO, getCurrentUser().getCurrentTenantId());
+        return newSysNoticeDTO == null ? ResponseEntity.badRequest().build() : ResponseEntity.ok().build();
+    }
 
 
-  @PostMapping("send")
-  @ApiOperation("发布通知")
-  public ResponseEntity<SysNoticeDTO> send(@RequestBody SysNoticeDTO sysNoticeDTO) throws ThingsboardException {
-    sysNoticeDTO.setStatus(FastIotConstants.DraftStatus.PUBLISHED);
-    SysNoticeDTO sysNoticeDto =
-        sysNoticeService.send(
-            sysNoticeDTO,
-            getCurrentUser().getCurrentTenantId(),
-            getCurrentUser().getCurrentUserId());
-    return sysNoticeDto == null ? ResponseEntity.badRequest().build() : ResponseEntity.ok().build();
-  }
+    @PostMapping("send")
+    @ApiOperation("发布通知")
+    public ResponseEntity<SysNoticeDTO> send(@RequestBody SysNoticeDTO sysNoticeDTO) throws ThingsboardException {
+        sysNoticeDTO.setStatus(FastIotConstants.DraftStatus.PUBLISHED);
+        SysNoticeDTO sysNoticeDto =
+                sysNoticeService.send(
+                        sysNoticeDTO,
+                        getCurrentUser().getCurrentTenantId(),
+                        getCurrentUser().getCurrentUserId());
+        return sysNoticeDto == null ? ResponseEntity.badRequest().build() : ResponseEntity.ok().build();
+    }
 }
 }