相机树增加权限控制

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -383,15 +383,19 @@ public class MsgAlarmController extends BaseController {
     @ApiOperation("根据报警信息ID解除报警")
     @Log(title = "报警信息管理", businessType = BusinessType.UPDATE)
     public AjaxResult updateIsLock(@RequestParam(value = "id") Long id,
-                                   @RequestParam(value = "releasedType") Integer releasedType,
-                                   @RequestParam(value = "releasedReason") String releasedReason) {
+                                   @RequestParam(value = "releasedType",required = false) Integer releasedType,
+                                   @RequestParam(value = "releasedReason",required = false) String releasedReason) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
         msgAlarm.setIsLock(1);
         msgAlarm.setUpdateBy(getUserId());
         msgAlarm.setReleasedBy(getUserId());
         msgAlarm.setReleasedTime(new Date());
-        msgAlarm.setReleasedReason(releasedReason);
-        msgAlarm.setReleasedType(releasedType);
+        if (!ObjectUtils.isEmpty(msgAlarm.getReleasedReason())) {
+            msgAlarm.setReleasedReason(releasedReason);
+        }
+        if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
+            msgAlarm.setReleasedType(releasedType);
+        }
         return AjaxResult.success(msgAlarmService.updateById(msgAlarm));
     }