From cd02923a7ce1ffa004b3abbb7af67ab6173dd99d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期一, 25 三月 2024 10:59:40 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
index d1487d7..6e32171 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
@@ -27,9 +27,10 @@
* 应急预案列表
*/
@RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
- private ResultVO<List<EmergencyPlanPageRespDTO>> list (@RequestBody PageQuery<EmergencyPlanQuery> pageQuery){
+ private ResultVO<List<EmergencyPlanPageRespDTO>> list (Authentication authentication,@RequestBody PageQuery<EmergencyPlanQuery> pageQuery){
PageUtils.checkCheck(pageQuery);
- return emergencyPlanService.selectEmergencyPlanList(pageQuery);
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyPlanService.selectEmergencyPlanList(currentUser.getUid(),pageQuery);
}
/**
@@ -68,9 +69,6 @@
/**
* 应急预案废止/还原
- */
- /**
- * 应急预案详情
*/
@RequestMapping(value = "/updateAbolish",method = RequestMethod.GET)
public ResultVO updateAbolish(Long id ,Boolean abolishStatus){
--
Gitblit v1.9.2